Hi, Le 19/11/2014 19:23, Maxime Chatelle a écrit : [...] > The package is cakephp. Upstream maintains 3 main branches: 1.3.x, 2.x and > 3.x > > I plan to use the following naming scheme for branches: > > upstream/1.3.x (fast-forward only branch feeded by upstream releases) > debian/1.3.x/master (devel branch, merged into debian/1.3.x/<suite> > branches, can be seen as experimental) > debian/1.3.x/<suite> (wheezy, jessie, stretch, ...) > > And the same for other series: > > upstream/2.x > debian/2.x/master > debian/2.x/<suite> > > upstream/3.x > debian/3.x/master > debian/3.x/<suite> > > For tag names, as usual I will use: > upstream/1.3.20 > debian/1.3.20-1 > That sounds entirely reasonable to me, especially if it is useful in your workflow (e.g. make a change in debian/1.3.x/master, then merge it into debian/2.x/master and debian/3.x/master...) [...] > Beside of that, what is your opinion about maintaining quilt patches > into distinct branches (properly named) and generate the quilt patch > series into a temporary build dir/branch ? That's entirely up to you. Some helper tools require this scheme, others don't, and when working manually, you do as you see fit. Kind regards, Thibaut.
Attachment:
signature.asc
Description: OpenPGP digital signature