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

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

Re: Messed up a salsa commit - Reporting the fix

Path csiph.com!newsfeed.xs4all.nl!newsfeed8.news.xs4all.nl!bofh.it!news.nic.it!robomod
From Julian Gilbey <julian@d-and-j.net>
Newsgroups linux.debian.maint.python
Subject Re: Messed up a salsa commit - Reporting the fix
Date Tue, 26 Apr 2022 14:30:01 +0200
Message-ID <Egsul-bjYg-1@gated-at.bofh.it> (permalink)
References <EfQIp-aWgw-3@gated-at.bofh.it> <EfRl7-aWuZ-3@gated-at.bofh.it> <EgqiR-biAP-1@gated-at.bofh.it> <Egryh-bjok-1@gated-at.bofh.it>
X-Original-To Geert Stappers <stappers@debian.org>
X-Mailbox-Line From debian-python-request@lists.debian.org Tue Apr 26 12:24:22 2022
Old-Return-Path <julian@d-and-j.net>
X-Amavis-Spam-Status No, score=-7.11 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FOURLA=0.1, LDO_WHITELIST=-5, T_SCC_BODY_TEXT_LINE=-0.01] autolearn=ham autolearn_force=no
X-Policyd-Weight using cached result; rate:hard: -4.6
MIME-Version 1.0
Content-Type text/plain; charset=us-ascii
Content-Disposition inline
X-Mailing-List <debian-python@lists.debian.org> archive/latest/19909
List-ID <debian-python.lists.debian.org>
List-URL <https://lists.debian.org/debian-python/>
List-Archive https://lists.debian.org/msgid-search/YmfkZ93swiz7QnEn@d-and-j.net
Approved robomod@news.nic.it
Lines 41
Organization linux.* mail to news gateway
Sender robomod@news.nic.it
X-Original-Cc debian-python@lists.debian.org
X-Original-Date Tue, 26 Apr 2022 13:24:07 +0100
X-Original-Message-ID <YmfkZ93swiz7QnEn@d-and-j.net>
X-Original-References <YmWsfgh9aGaHTJ/C@d-and-j.net> <20220424204251.u7kqa2cd7xf2sabw@mail.gaussglocke.de> <YmfDbC5Ky2cwF0aN@d-and-j.net> <20220426112625.jihrwhhvfisakmaq@gpm.stappers.nl>
Xref csiph.com linux.debian.maint.python:14085

Show key headers only | View raw

On Tue, Apr 26, 2022 at 01:26:26PM +0200, Geert Stappers wrote:
> [...]
> > So the state of the salsa repository was (in an ideal world where I'd
> > pulled upstream):
> > - master included the upstream/5.3.0 commit, tagged as upstream/5.3.0,
> >   along with further commits
> > - upstream was at upstream/5.2.2
> > - pristine-tar contained data up to upstream/5.2.2
> > 
> > To fix the problem, I did:
> > 
> > $ git checkout upstream
> > $ git reset --hard upstream/5.3.0
> 
> FWIW Here I miss a `git commit -a`

Actually there is no git commit here, surprisingly.  When running
`gbp import-orig`, if I understand correctly, it checks out the
previous upstream in the master branch, then unpacks the new upstream
and commits it, tagging it as "upstream/..." - this commit has a
single parent: the previous upstream commit.  Then it merges the
debian/ directory of the previous commit in the master branch with the
new upstream.  The "upstream" branch contains just the upstream
commits; "upstream" is just a pointer to the most recent upstream
commit, so the `git reset` command here moves the pointer to the
correct place.  There are no uncommitted files.

> Thanks for reporting, thanks for sharing what was learnt.

:-)

> > I hope I don't make this mistake again!
> 
> No worries, there will be other mistakes  and that is good.
> Know that the only way to avoid mistakes is doing nothing.

That is indeed true!

Best wishes,

   Julian

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