On Sun, Aug 25, 2019 at 09:40:16PM +0200, Guðjón Guðjónsson 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. -- WBR, wRAR
signature.asc
Description: PGP signature
