A (git) workflow for Debian packaging

[Pierre Habouzit]

On Fri, Oct 05, 2007 at 09:43:36PM +0000, martin f krafft wrote:
> also sprach Pierre Habouzit <madcoder at debian.org> [2007.10.05.1620 +0100]:
> >   Ver0                                   Ver1
> > ---O---o---o---o---o---o---o---o---o---o---O---o---o---> (upstream)
> >    |
> >    \
> >     p---p---p---p---p---p---p---p (patches)
> >             |               |    \___
> >              \               \       \
> > --x---x---x---x---x---x---x---x---x---X---x---x---x---> (debian)
> >                                    Ver0-3
> > 
> > patches can be built with as many cherry-picks from upstream as
> > needed.
> 
> You mean you might cherry-pick a commit from upstream after Ver0 was
> released and track it in your patches branch?

  Or I write custom ones, it depends.

> > The important part is to never ever _merge_ anything _in_ "patches".
> 
> Why is that important?

  Because it would make the rebase of the "patches" branch hurt.

> >   Like said, this approach works very well even with many patches-like
> > branches. Keeping them under a common namespace can help people
> > understand they should only merge them or cherry-pick from them, and
> > never branch them off.
>
> What is a good namespace to use for that?

  I don't know, I usually have only one branch called "patches" but I
suppose I'll use topic/foo for a series about feature "foo".


> Thanks for sharing your workflow with us. One thing I don't see is
> how you separate different aspects of the Debianisation, or do you
> just not care? Or is that another one of the "patches" branches,
> just not designed for upstream since it may well touch ./debian/?

  Debianization occurs in the "debian" branch. Meaning that ./debian is
not touched either in upstream or in patches. Unless there is an
upstream ./debian, in that case, the first patch of my "patches" branch
would be the patch that deletes it.

  There is also patches that are debian specific that go in that branch
(usualy build-system debian-specific patches that I don't intend to push
upstream because those are hacks). I don't like having multiple branches
just for the sake of it.

-- 
·O·  Pierre Habouzit
··O                                                madcoder at debian.org
OOO                                                http://www.madism.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20071007/049cdf42/attachment.pgp