[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: git-buildpackage branch names



hi jérémy,

On Fri, Feb 11, 2011 at 09:46:13AM +0100, Jérémy Lal wrote:
> What's the best way to name gbp branches ?
> I thought of something like :
> 2.0			1.0.x
> master			master-1.0.x
> upstream		upstream-1.0.x
> pristine-tar		pristine-tar-1.0.x
> 
> is there some common practice ?

personally, i don't use "master" or references to specific upstream
versions at all in the branching, and use something like the following:

debian-experimental/upstream-experimental
debian-sid/upstream-sid
debian-squeeze/upstream-squeeze

(etc).  the pkg-php php.git would be a good example of that.

i find this system is generally intuitive and trouble free, as long as you
don't end up needing to support multiple versions of the software in
the *same* release.

fyi about git-buildpackage: you can put the branch names and any other
release-specific stuff in ./debian/gbp.conf, on the respective debianized
branch, which means you can have different configurations on a per-branch
basis, and don't need to pass all those pesky options to gbp every time
you run it :)


	sean


Reply to: