Hi Guðjón! On Sun, Aug 25, 2019 at 10:01:02PM +0200, Guðjón Guðjónsson wrote: > I did follow the procedure but I don't know what to do if a patch > doesn't apply cleanly. > I did try > gbp pq import > gbp:info: Trying to apply patches at > 'c72f39a3a32b5e5c1eb7f9aaf7176e942e85d804' > gbp:warning: Patch 0004-remove-logo-privacy-issue.diff.patch failed to > apply, retrying with whitespace fixup
The correct procedure is running “gbp pq import” *before* importing a new tarball. Then after importing you do “gbp pq rebase”. Sometimes I myself forget to run “gbp pq import”. In this case I do the following: - Remember the current commit SHA1; - git reset --hard origin/debian/master; # or to previous tag - gbp pq import; # this is the needed step - git checkout debian/master; # back to debian/master branch - git merge COMMIT_ID; # that you remembered before > But fixing the patches with quilt before importing them the second > time seems to fix all my problems. If it does not break the patches metadata then it also works. -- Dmitry Shachnev
signature.asc
Description: PGP signature
