Messed up a salsa commit - how best to fix?

2022-04-24 Thread Julian Gilbey
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 simples

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

2022-04-24 Thread Geert Stappers
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

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

2022-04-24 Thread Julian Gilbey
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 (

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

2022-04-24 Thread Timo Röhling
Hi Julian, * Julian Gilbey [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 com

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

2022-04-24 Thread Timo Röhling
* Timo Röhling [2022-04-24 22:42]: Make sure that your local upstream branch and the upstream/5.3.0 tag both point at commit 08935221b549bf32157d739cd54eb1645a2ab123: Aaaand I copied the wrong commit hash to the email. :/ e228e8902aeb91011a53bb1a91f7f3390a771e0e is the one you should be looking

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

2022-04-24 Thread Julian Gilbey
Hi Timo, On Sun, Apr 24, 2022 at 10:42:51PM +0200, Timo Röhling wrote: > Hi Julian, > > * Julian Gilbey [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 one

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

2022-04-24 Thread Julian Gilbey
On Sun, Apr 24, 2022 at 10:49:55PM +0200, Timo Röhling wrote: > * Timo Röhling [2022-04-24 22:42]: > > Make sure that your local upstream branch and the upstream/5.3.0 tag > > both point at commit 08935221b549bf32157d739cd54eb1645a2ab123: > Aaaand I copied the wrong commit hash to the email. :/ >

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

2022-04-24 Thread Julian Gilbey
On Sun, Apr 24, 2022 at 10:49:55PM +0200, Timo Röhling wrote: > * Timo Röhling [2022-04-24 22:42]: > > Make sure that your local upstream branch and the upstream/5.3.0 tag > > both point at commit 08935221b549bf32157d739cd54eb1645a2ab123: > Aaaand I copied the wrong commit hash to the email. :/ >

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

2022-04-24 Thread Geert Stappers
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 > > > upst