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 - how best to fix?
Date: Sun, 24 Apr 2022 23:20:02 +0200
Message-ID: <EfROa-aWYO-1@gated-at.bofh.it>
References: <EfQIp-aWgw-3@gated-at.bofh.it> <EfRl7-aWuZ-3@gated-at.bofh.it> <EfRuN-aWBh-1@gated-at.bofh.it>
X-Original-To: debian-python@lists.debian.org
X-Mailbox-Line: From debian-python-request@lists.debian.org  Sun Apr 24 21:13:02 2022
Old-Return-Path: <julian@d-and-j.net>
X-Amavis-Spam-Status: No, score=-7.21 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DIGITS_LETTERS=1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, LDO_WHITELIST=-5, MD5_SHA1_SUM=-1, T_SCC_BODY_TEXT_LINE=-0.01] autolearn=ham autolearn_force=no
X-Policyd-Weight: using cached result; rate: -4.6
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
X-Mailing-List: <debian-python@lists.debian.org> archive/latest/19900
List-ID: <debian-python.lists.debian.org>
List-URL: <https://lists.debian.org/debian-python/>
List-Archive: https://lists.debian.org/msgid-search/YmW9T+ysYUqKPOZG@d-and-j.net
Approved: robomod@news.nic.it
Lines: 18
Organization: linux.* mail to news gateway
Sender: robomod@news.nic.it
X-Original-Date: Sun, 24 Apr 2022 22:12:47 +0100
X-Original-Message-ID: <YmW9T+ysYUqKPOZG@d-and-j.net>
X-Original-References: <YmWsfgh9aGaHTJ/C@d-and-j.net> <20220424204251.u7kqa2cd7xf2sabw@mail.gaussglocke.de> <20220424204955.l3ng5oxr5cb5ts5n@mail.gaussglocke.de>
Xref: csiph.com linux.debian.maint.python:14075

On Sun, Apr 24, 2022 at 10:49:55PM +0200, Timo Röhling wrote:
> * Timo Röhling <roehling@debian.org> [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 for:
> 
> https://salsa.debian.org/python-team/packages/python-qtconsole/-/commit/e228e8902aeb91011a53bb1a91f7f3390a771e0e

Indeed, that was the commit made by gbp import-orig.  But the upstream
and pristine-tar branches don't include that commit, unfortunately,
because of my mistake.  Therefore gbp buildpackage doesn't work,
because it can't find the original sources on the upstream branch.

Best wishes,

   Julian