On Sat, Aug 16, 2014 at 09:51:21PM +0200, Bastien ROUCARIES wrote: > On Sat, Aug 16, 2014 at 1:59 PM, Raphael Hertzog <hert...@debian.org> wrote: > > Hi, > > > > On Fri, 15 Aug 2014, Guido Günther wrote: > >> The gbp manual has a recommended branch layout: > >> > >> > >> http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html#GBP.BRANCH.NAMING > >> > >> which could serve as a basis. There's plenty of room for improvement, > >> e.g. the case where one tracks upstream git isn't yet mentioned (I > >> started to follow the above layout also in this case). > > > > Some comments on this recommended layout: > > > > 1/ I suggested <vendor>/master rather than <vendor>/unstable (or sid) > > because it means we don't have to know the default codename/suite used > > for packaging of new upstream versions (in particular for downstreams) > > > > 2/ having multiple upstream/<codename> is bound to never be up-to-date > > when I do "git checkout debian/experimental && git merge > > debian/master", upstream/experimental will get out of sync and I > > won't notice it because my package builds just fine > > > > However multiple upstream/* branches can be useful, they should > > just match real upstream branches... so things like upstream/master, > > upstream/4.8.x, upstream/4.9.x, etc. > > > > 3/ I don't see the need for backports/<codename>, I would rather > > use debian/wheezy-backports (which actually is just a specific case > > of <vendor>/<codename> since wheezy-backports is the Codename in the > > Release file) > > and security/<codename> is just the continuation of <vendor>/<codename> > > after a stable release, so again I don't see the need for a specific > > branch here (and if we really need a separate branch, it can again > > be <vendor>/<codename>-security) > > I use for debian patches a debian-patches/version branch. Friendly > upstream could cherry pick if they need it.
Agreed. I'm using something similar but as a tag not branch like patch-queue/<version> which is the patch-queue corresponding to Debian release <version>. This can also be used by others to rebase the queue for new versions (omitting the need for gbp pq --time-machine=... if the new upstream is already imported). Cheers, -- Cheers, -- To UNSUBSCRIBE, email to debian-devel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140817181437.ga23...@bogon.m.sigxcpu.org
