Path: csiph.com!newsfeed.xs4all.nl!newsfeed9.news.xs4all.nl!bofh.it!news.nic.it!robomod
From: Timo =?utf-8?Q?R=C3=B6hling?= <roehling@debian.org>
Newsgroups: linux.debian.maint.python
Subject: Re: Messed up a salsa commit - how best to fix?
Date: Sun, 24 Apr 2022 23:00:01 +0200
Message-ID: <EfRuN-aWBh-1@gated-at.bofh.it>
References: <EfQIp-aWgw-3@gated-at.bofh.it> <EfRl7-aWuZ-3@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 20:50:32 2022
Old-Return-Path: <roehling@debian.org>
X-Amavis-Spam-Status: No, score=-113.584 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, BODY_8BITS=1.5, DIGITS_LETTERS=1, DKIMWL_WL_HIGH=-0.575, 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, PGPSIGNATURE=-5, RCVD_IN_DNSWL_MED=-2.3, T_SCC_BODY_TEXT_LINE=-0.01, USER_IN_DKIM_WELCOMELIST=0.001, USER_IN_DKIM_WHITELIST=-100] autolearn=ham autolearn_force=no
X-Policyd-Weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .debian. - helo: .mailproxy07.manitu. - helo-domain: .manitu.)  FROM/MX_MATCHES_NOT_HELO(DOMAIN)=0; rate: -3.5
Mail-Followup-To: debian-python@lists.debian.org
Organization: The Debian Project
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5qs4reicxrapn267"
Content-Disposition: inline
X-Mailing-List: <debian-python@lists.debian.org> archive/latest/19898
List-ID: <debian-python.lists.debian.org>
List-URL: <https://lists.debian.org/debian-python/>
List-Archive: https://lists.debian.org/msgid-search/20220424204955.l3ng5oxr5cb5ts5n@mail.gaussglocke.de
Approved: robomod@news.nic.it
Lines: 60
Sender: robomod@news.nic.it
X-Original-Date: Sun, 24 Apr 2022 22:49:55 +0200
X-Original-Message-ID: <20220424204955.l3ng5oxr5cb5ts5n@mail.gaussglocke.de>
X-Original-References: <YmWsfgh9aGaHTJ/C@d-and-j.net> <20220424204251.u7kqa2cd7xf2sabw@mail.gaussglocke.de>
Xref: csiph.com linux.debian.maint.python:14074


--5qs4reicxrapn267
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

* Timo R=C3=B6hling <roehling@debian.org> [2022-04-24 22:42]:
>Make sure that your local upstream branch and the upstream/5.3.0 tag=20
>both point at commit 08935221b549bf32157d739cd54eb1645a2ab123:
Aaaand I copied the wrong commit hash to the email. :/
e228e8902aeb91011a53bb1a91f7f3390a771e0e is the one you should be
looking for:=20

https://salsa.debian.org/python-team/packages/python-qtconsole/-/commit/e22=
8e8902aeb91011a53bb1a91f7f3390a771e0e

>Cheers
>Timo

--=20
=E2=A2=80=E2=A3=B4=E2=A0=BE=E2=A0=BB=E2=A2=B6=E2=A3=A6=E2=A0=80   =E2=95=AD=
=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=
=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=
=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=
=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=
=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=
=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=
=E2=94=80=E2=94=80=E2=95=AE
=E2=A3=BE=E2=A0=81=E2=A2=A0=E2=A0=92=E2=A0=80=E2=A3=BF=E2=A1=81   =E2=94=82=
 Timo R=C3=B6hling                                       =E2=94=82
=E2=A2=BF=E2=A1=84=E2=A0=98=E2=A0=B7=E2=A0=9A=E2=A0=8B=E2=A0=80   =E2=94=82=
 9B03 EBB9 8300 DF97 C2B1  23BF CC8C 6BDD 1403 F4CA =E2=94=82
=E2=A0=88=E2=A0=B3=E2=A3=84=E2=A0=80=E2=A0=80=E2=A0=80=E2=A0=80   =E2=95=B0=
=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=
=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=
=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=
=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=
=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=
=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=
=E2=94=80=E2=94=80=E2=95=AF

--5qs4reicxrapn267
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQGzBAABCgAdFiEEJvtDgpxjkjCIVtam+C8H+466LVkFAmJlt+8ACgkQ+C8H+466
LVmAqAv/dDzBlr3YC49FlJbjauztTyNBSw9wveobU5wloxTDtdsTYTWI5h8lEpmU
y/gvI3YqVhsp5/Uye+61VBRtCgEApeeO8PJUsSbzS4xo3mK4kit7koi3Kj/HaA2p
Ue0cjEzBLWjzAdpbCrQJAPX6cky4lQYBxTqTafMu1vlNuSoVuezVRCRsgD9VzoC5
kdUsOaVqlQgNoAv2TrQneC93RMQiLdqkEaVJuLycgImzh0Wv7smEQGGdEmz8/Qqd
KxP5ggyiTEp8baNGzHfmHdQ7Kn0TY8W6btjPLEu5eOPa3m4Nvdcp0+FJoJB4tRqg
oHZ6r5HCvMIG+mTl8gG5GSBvMgUZUWGK9z8JGAs591ZMwr3ewjGBtodjSv6FI7xs
CoOjICFMHDPRcARTLlINiOu1cnIWbTGaYlBjtgtwkOJ9VQ1oBTN6+K3e7ioUwzlg
I0RWbBOQhNgbv1i8/WfZd4NfsY292+ymXwetAORSKRM6K517lp1bFGI3YwRcJ3Lr
uVII0M80
=ZYuO
-----END PGP SIGNATURE-----

--5qs4reicxrapn267--