diff options
Diffstat (limited to 'development')
| -rw-r--r-- | development/debian_packages_in_git.mdwn | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/development/debian_packages_in_git.mdwn b/development/debian_packages_in_git.mdwn index 8789e47..ad1f4e6 100644 --- a/development/debian_packages_in_git.mdwn +++ b/development/debian_packages_in_git.mdwn @@ -9,28 +9,32 @@ I'm keeping all patches for a Debian package that is maintained on branch *foo* Disadvantage: - -* no history on the *patch-queue/foo/* branch +* no history on the *patch-queue/foo* branch, but you do have the history on *foo* of course. #### workflow: -* create *patch-queue* branch if it doesn't exist: - - git checkout -b patch-queue/master +* create *patch-queue* branch and import *debian/patches* onto it using [gbp-pq](http://honk.sigxcpu.org/projects/git-buildpackage/gbp-pq) : -* 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 + cd $REPO + gbp-pq import * 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): +* regenerate the patches in *debian/patches/* using [gbp-pq](http://honk.sigxcpu.org/projects/git-buildpackage/gbp-pq): - redo-patches + gpg-pq export * commit the result +* after importing a new upstream version you can use the following commands to refresh *debian/patches*: + + gbp-pq rebase + git checkout master + gbp export + + + #### Team maintenance -You can push out patch-queue branches. Other team members must just be aware that that branches in the *patch-queue/* namespace are being rebased frequently. +You can push out patch-queue branches. Other team members must just be aware that that branches in the *patch-queue/* namespace are being rebased frequently. But it's actually easier to simply use *gbp-pq import* and keep the patch-queue branch local only. |