The whole rebasing and patch-queue handling would be much cleaner if the patch-queue branch was based on the merge-base of the branch that should contain the debian packaging (e.g. master) and the upstream branch (e.g. upstream).
I.e. gbp-pq could do the following for import: * current = current branch * pq-name = "patch-queue/$current" * upstream = upstream-branch from gbp.conf or "upstream" * base = git merge-base $current $upstream * git checkout -b $pq-name $base * apply patches gbp-pq export could then do: * current = current branch * pq-name = "patch-queue/$current" * upstream = upstream-branch from gbp.conf or "upstream" * base = git merge-base $pg-name $upstream * git-format patch -o debian/patches $base..$pq-name and gbp-rebase finally could do: * current = current branch * pq-name = "patch-queue/$current" * upstream = upstream-branch from gbp.conf or "upstream" * old-base = git merge-base $pg-name $upstream * new-base = git merge-base $current $upstream * git rebase --onto $new-base $old-base $pq-name This is much more rebase-friendly and ensures that the patches only operate on upstream contents. They need not be aware of all the things going on in the debian packaging branch in the first place. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
