Hi Julian, * Julian Gilbey <julian@d-and-j.net> [2022-04-24 21:01]:
Somehow I managed to really mess up a commit to python-qtconsole: the upstream and pristine-tar branches do not have the upstream/5.3.0 sources (the current ones). However, there's already an upstream/5.3.0 tag in the repository, pointing to a commit to the master branch. I think the simplest thing to do is to "rewrite history": delete the head commits to the master branch and the 5.3.0 tags, and then recommit correctly and force-push to salsa. Would people be OK with me doing this, or do you have an alternative suggestion?
I looked at the Salsa repository, and it is not so bad. It seems like you forgot to pull the latest changes in upstream and pristine-tar from the 5.2.2 import first, so your import of 5.3.0 forked the those branches unintentionally. As the first order of business, you should run $ git fetch origin to update all your remote branches to the actual locations. Then, we can fix the branches one by one. For the pristine-tar branch, the easiest way is to rebase your commit to the actual remote branch that includes the 5.2.2 import by Frédéric: $ git checkout pristine-tar $ git rebase origin/pristine-tar $ git push origin pristine-tar The upstream branch cannot be rebased, because it is interwined with the master branch. Fortunately, that is not necessary, because the 5.2.2 import has been merged into master and therefore is connected in the graph.Make sure that your local upstream branch and the upstream/5.3.0 tag both point at commit 08935221b549bf32157d739cd54eb1645a2ab123:
$ git -P log -n1 upstream $ git -P log -n1 upstream/5.3.0 If they do, you can $ git push --force origin upstream upstream/5.3.0 This will remove the 5.2.2 import from the upstream branch history, but it will not be lost because it is still connected to the master branch, which is arguably the more important connection, as it allows you to reproduce the 5.2.2 upload if required. Cheers Timo -- ⢀⣴⠾⠻⢶⣦⠀ ╭────────────────────────────────────────────────────╮ ⣾⠁⢠⠒⠀⣿⡁ │ Timo Röhling │ ⢿⡄⠘⠷⠚⠋⠀ │ 9B03 EBB9 8300 DF97 C2B1 23BF CC8C 6BDD 1403 F4CA │ ⠈⠳⣄⠀⠀⠀⠀ ╰────────────────────────────────────────────────────╯
Attachment:
signature.asc
Description: PGP signature