Then you are in the patch-queue branch and can git log, commit, cherry-pick
upstream commits, rebase, etc. there. After you are done, run
- gbp-pq export --no-patch-numbers
+ gbp-pq export
which will put you back into master and update debian/patches/ (including
series). You need to git add etc. new patches, add a changelog and other
Now resolve all the conflicts, skip obsolete patches, etc. When you are done, run
- gbp-pq export --no-patch-numbers
+ gbp-pq export
+
+Note that our debian/gbp.conf disables patch numbers.
Cherry-picking upstream patches
-------------------------------