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

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

Re: Messed up a salsa commit - how best to fix?

Show all headers | View raw

On Sun, Apr 24, 2022 at 09:40:53PM +0100, Julian Gilbey wrote:
> On Sun, Apr 24, 2022 at 10:09:21PM +0200, Geert Stappers wrote:
> > On Sun, Apr 24, 2022 at 09:01:02PM +0100, Julian Gilbey wrote:
> > > 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,
> > 
> > I'm not OK with rewriting history.
> > 
> > > or do you have an alternative suggestion?
> > 
> > Accept the failure, learn from it, move on, make new mistakes, learn from them.
> > 
> > In other words:  Do not spend energy on erasing a mistake^Wlearing expirience.
> 
> I do understand this, but now someone cloning the repository and
> running "gbp buildpackage" won't be able to do so.
> 
> I realise there is a much more minor change that would fix things:
> just delete the upstream/5.3.0 tag, create the upstream/5.3.0
> pristine-tar and upstream branch contents manually, make a commit with
> those and recreate the upstream/5.3.0 tag to point to those.
> 
> Would that be acceptable?

If upstream has a 5.3.1  go for 5.3.1 in Debian.
If an upstream 5.3.1 will take weeks, go for 5.3.01 
 
 
Groeten
Geert Stappers
-- 
Silence is hard to parse

Back to linux.debian.maint.python | Previous | Next — Previous in thread | 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