Path: csiph.com!news.dns-netz.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod
From: Andrey Rahmatullin <wrar@debian.org>
Newsgroups: linux.debian.maint.python
Subject: Re: Git, gbp blues
Date: Sun, 25 Aug 2019 22:20:02 +0200
Message-ID: <yz79w-362-9@gated-at.bofh.it>
References: <yz6Gt-2Fh-3@gated-at.bofh.it> <yz6Qa-2IP-15@gated-at.bofh.it> <yz6ZQ-32C-3@gated-at.bofh.it>
Old-Return-Path: <wrar@debian.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="a8sldprk+5E/pDEv"
Content-Disposition: inline
User-Agent: Mutt/1.10.1 (2018-07-13)
Approved: robomod@news.nic.it
Lines: 62
Organization: linux.* mail to news gateway
Sender: robomod@news.nic.it
Xref: csiph.com linux.debian.maint.python:11670


--a8sldprk+5E/pDEv
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Aug 25, 2019 at 10:01:02PM +0200, Gu=C3=B0j=C3=B3n Gu=C3=B0j=C3=B3n=
sson wrote:
> > > Isn't this an error. Shouldn't it be git checkout?
> > > $ gbp checkout debian/master
> > Yes.
> You mean it should be git checkout?
Yes.

> > If you ran gbp pq import after importing the new tarball and it didn't =
say
> > "Patch queue branch 'patch-queue/master'. already exists. Try 'rebase' =
or
> > 'switch' instead." this means you didn't follow the procedure you copied
> > above, which includes running gbp pq import before gbp import-orig.
>=20
> I did follow the procedure but I don't know what to do if a patch
> doesn't apply cleanly.
You seem to be misunderstanding what I wrote.

> I did try
> gbp pq import
> gbp:info: Trying to apply patches at 'c72f39a3a32b5e5c1eb7f9aaf7176e942e8=
5d804'
> gbp:warning: Patch 0004-remove-logo-privacy-issue.diff.patch failed to
> apply, retrying with whitespace fixup
This cannot happen when you run gbp pq import before running gbp
import-orig, as the wiki page tells you to do.
And this cannot happen when you run it after gbp import-orig, if you also
ran it before running gbp import-orig, as the wiki page tells you to do.
So this can only happen if you didn't follow the procedure.

--=20
WBR, wRAR

--a8sldprk+5E/pDEv
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQJhBAABCgBLFiEEolIP6gqGcKZh3YxVM2L3AxpJkuEFAl1i6yYtFIAAAAAAFQAP
cGthLWFkZHJlc3NAZ251cGcub3Jnd3JhckBkZWJpYW4ub3JnAAoJEDNi9wMaSZLh
nPAP/ROsLhLG9Np4b9g0IFSECLmOpesmxWGaJ/VHii0flGqun9k8cEtZRifAKmJh
zs7iSY/DhzmyQcP4Qp10oJ2HTfNSj37a51b8Ic/D5W/kvL1CHlEAjUqmAXAgyd6o
TfueVvmsmLAkC+GKLnEMg9MWoFLLuIvlN7Fci4Mb6fzyOL7czHK93Eml4UTInJoZ
bwIuO8/ctrpdaR/Hc3XCjq751HgGAISN/lJpQnct7OrcjZqYzFAv7CqmE9yq6hld
l6M6q9Y9H1ucDTOC9K0wa0om2c/4ZPAQhA/+o+ZVOU+4uLYr1afDKBk8B2OIkB/6
K88TV/pSdg1wUo0UjS4ufi6qFbsHkiNiKDm8TZGUVC71J/FeHc9ocEr2awZhyVTb
2tnDKuexDFooyC6u6ZBkg1/yNYNH9/Qj5oTyPTTo07nbCTk81BsDfPWvtxlvR1Ou
Kojf4ASnWJp5uzY571mEy9E8K+k35DaCi8Vyu3T+Fqwx34RW4ylyKrnBT3RfX2RU
1SuJRmTSrWkWBXeMrWRduUxxR8A37Mu+scsfPyE3WYo0n862hiYiDd20HAxApQMP
A6hXsm90uVBYdseYEaeASl5JbB07/yYv7tzKLVWpUupjOkUYpRLs8fCIJkF20mZY
0MYbmaHxLJWsnwGIA1wTkhchzhj7ikrtts/K/2chdonpjia3
=Gh/h
-----END PGP SIGNATURE-----

--a8sldprk+5E/pDEv--