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:00:02 +0200
Message-ID: <yz6Qa-2IP-15@gated-at.bofh.it>
References: <yz6Gt-2Fh-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="Y+xroYBkGM9OatJL"
Content-Disposition: inline
User-Agent: Mutt/1.10.1 (2018-07-13)
Approved: robomod@news.nic.it
Lines: 66
Organization: linux.* mail to news gateway
Sender: robomod@news.nic.it
Xref: csiph.com linux.debian.maint.python:11667


--Y+xroYBkGM9OatJL
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Aug 25, 2019 at 09:40:16PM +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.

> But I still find working with patch queues difficult especially with
> new upstream where the old patches don't apply correctly.
> I tried to do
> $ gbp pq import
> but it fails because one of the patches doesn't apply.
> So I fixed the patches in the old way using
> quilt push -f
> quilt edit
> quilt refresh
> And after having fixed all the patches I could do
> $gbp pq import
> $gbp pq export
> and the diff seems ok.
> Is this the correct procedure?
The correct procedure is documented on that page.

"""
Rebase the patches:

$ gbp pq rebase
$ gbp pq export
"""

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
WBR, wRAR

--Y+xroYBkGM9OatJL
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQJhBAABCgBLFiEEolIP6gqGcKZh3YxVM2L3AxpJkuEFAl1i5mwtFIAAAAAAFQAP
cGthLWFkZHJlc3NAZ251cGcub3Jnd3JhckBkZWJpYW4ub3JnAAoJEDNi9wMaSZLh
3cIP/1PkSS6Q3LMT11gfaqQGJP83rMY4E7j5mb94o/Gx9pIlUW9LbE5KD++U8PRd
Za2XFQ2UXYiP1rXnzgEZIkUZVDS4riJu1mbakP2NudQWKnnMdeAcicP48/CKSp4/
Ai9X4RO40wHDw//0rZRLQy0vmcR//QNhsLFj9G6X4zzWBuABGuu8+HncuTCnK8ms
5aZTqNJhDGsCsHs2Z2a//g0eMgcHJ8BpFA5THh15+5JlBlSW3SsR32PSjun6upr7
DPHCi3R0peKBMUZo0SP3AlHuEaByfAHGn20+xiPXO0X50PCG5sw3kqCuPx5NhcUk
88i14FmLS0RNk9/SSw4rCZwOo5MBxKxaSGR80cUB4VsqMt6QZfa3l2FnWXz8R0oB
yTEmkwskl2KiLMv3xuUSqLawus1z1ATozbxtZGuGR5+QDv5HmvUBBKcrMX1Bk4PZ
LSdZKpf6ksx361RvUjMKWg9JWqcGKCyWxZ9BWIa6iPPoYKgomv5NVjlbqKfkd/vM
XfSLgeYD1orlr55euN0bQV1k0qdqK4746glwMwogjsYiQlLWnZSQeuH7jZoewVQT
l1PTbOXCmrdMZc7K2f/2YyRPLMsMjEIy8XjSjtaL8PW9m+sCQeZ6Br3dciuciFhF
+3KXQXmdcl30GXy/p6CvvwVlX34VTq6iVOeZ9AaNRK979oKZ
=azrQ
-----END PGP SIGNATURE-----

--Y+xroYBkGM9OatJL--