diff options
-rw-r--r-- | projects/git-buildpackage.mdwn | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn index 3982938..147075e 100644 --- a/projects/git-buildpackage.mdwn +++ b/projects/git-buildpackage.mdwn @@ -28,3 +28,36 @@ For enhancements and feauture requests you can either use the [Debian bugtrackin * [[!debbug git-buildpackage desc="bugs"]] filed in the Debian bugtracking system * more git-fast-import support * templating for git-dch + +### debian/patches on a patch-queue branch +I'm keeping all patches for a Debian package that is maintained on branch *foo* on a patch-queue branch *patch-queue/foo* since: + +* one can easily work with the unpatched (*foo*) and patched (*patch-queue/foo*) branches +* patches can easily be dropped, added by modifying the patch-queue branch (no messing with *quilt add*, *dpatch-edit-patch*, *cdbs-edit-patch* or the like) +* easy cherry-picking of patches for stable releases, etc. +* easy forward porting of patches to new upstream versions by using *git rebase* on the *patch-queue/foo* branch (patches already applied upatream are detected automatically). +* the generated patch in *debian/patches/* has all the necessary information to forward it upstream since it's auto generated via *git-format-patch*. + +Disadvantage: + +* no history on the *patch-queue/foo/* branch + +#### workflow: +* create *patch-queue* branch if it doesn't exist: + + git checkout -b patch-queue/master + +* import patches from debian/patches to get a patches source tree one can easily work on: + + QUILT_PATCHES=debian/patches git-quiltimport debian/patches/series + +* work an patch-queue branch (add, remove, rebase, test) +* switch back to master: + + git checkout master + +* regenerate the patches in *debian/patches/* using [redo-patches](http://honk.sigxcpu.org/projects/git-buildpackage/redo-patches): + + redo-patches + +* commit the result |