Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #14070

Messed up a salsa commit - how best to fix?

Show all headers | View raw

Hi,

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?

Best wishes,

   Julian

Back to linux.debian.maint.python | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 22:10 +0200
  Re: Messed up a salsa commit - how best to fix? Geert Stappers <stappers@stappers.nl> - 2022-04-24 22:10 +0200
    Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 22:50 +0200
      Re: Messed up a salsa commit - how best to fix? Geert Stappers <stappers@stappers.nl> - 2022-04-25 08:20 +0200
  Re: Messed up a salsa commit - how best to fix? Timo Röhling <roehling@debian.org> - 2022-04-24 22:50 +0200
    Re: Messed up a salsa commit - how best to fix? Timo Röhling <roehling@debian.org> - 2022-04-24 23:00 +0200
      Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 23:20 +0200
      Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 23:30 +0200
    Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-24 23:20 +0200
    Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-26 12:10 +0200
      Re: Messed up a salsa commit - Reporting the fix Geert Stappers <stappers@debian.org> - 2022-04-26 13:30 +0200
        Re: Messed up a salsa commit - Reporting the fix Julian Gilbey <julian@d-and-j.net> - 2022-04-26 14:30 +0200
      Re: Messed up a salsa commit - how best to fix? Timo Röhling <roehling@debian.org> - 2022-04-26 14:00 +0200
        Re: Messed up a salsa commit - how best to fix? Julian Gilbey <julian@d-and-j.net> - 2022-04-26 14:40 +0200

csiph-web