output from the vcs-pkg BoF @DebConf9

Guido Günther agx at sigxcpu.org
Wed Aug 5 14:58:06 UTC 2009


Hi Mehdi,
On Wed, Aug 05, 2009 at 12:02:20AM +0200, Mehdi Dogguy wrote:
[..snip..] 
> I use some scripts :
> 
> - Before creating a patch (eventually depending on one already present
> in the patch series), I call dom-apply-patches[1].
> - When I'm done with editing patches, I call dom-save-patches[2].
> 
> So, yes I create a fresh branch everytime as Frédéric pointed out. The
> details are in [1] and [2]. It's clearly useless when working solo but
> makes things a bit simpler when working within a team.
> 
> [1]
> http://git.debian.org/?p=pkg-ocaml-maint/packages/dh-ocaml.git;a=blob;f=tools/dom-apply-patches;h=1a5e406181d1129047344dbc92544269a6d6378c;hb=HEAD
> [2]
> http://git.debian.org/?p=pkg-ocaml-maint/packages/dh-ocaml.git;a=blob;f=tools/dom-save-patches;hb=HEAD
Looks pretty similar to what I do except that you use upstream while I
use the debian branch as the base. I do that so I can have different
patch-queues for different debian releases like:

patch-queue/master
patch-queue/lenny
patch-queue/bpo-lenny
patch-queue/experimental

The branch point for the patch-queue branch would then always be the tip
of the corresponding debian branch, like:

git branch patch-queue/lenny lenny
git quilt-import debian/patches/series

Cheers,
 -- Guido



More information about the vcs-pkg-discuss mailing list