[debian] where to document branch layout

[Stefano Zacchiroli]

On Tue, Jul 15, 2008 at 01:45:16PM -0700, Russ Allbery wrote:
> > branch layout for a given package. Regarding Debian,
> > debian/README.source comes to mind quickly, but its current description
> > in policy does not make it clear that it is the suitable place where to
> > document branch layout.
> The intention is to use that file for anything that helps explain how to
> make changes to a Debian source package.  I think this would qualify.

I take your word on this :-), ... but can I suggest to improve the
wording of Policy 4.14 to make it clearer? As it is right now the
wording is totally source package oriented. Hence, if one has a source
package which is entirely VCS-free (as it is normal to be), the text
describing README.source just does not apply, as the source package is
totally unrelated to the used VCS. That's why I was puzzled and why I
asked.

> FWIW, I've been keeping notes on what I'm personally doing at:
>     http://www.eyrie.org/~eagle/notes/debian/git.html

This is very interesting, thanks a lot for it! What others here do think
of the workflow / branch layout you propose? Are there any other usual
suspect as possible workflows / layouts?

A point of your notes is still obscure to me though. You wrote about
using a tmp-branch merge to serialize merges when conflicts arises from
multiple feature branches. I fail to understand if that implies that I
can then serialize, by just invoking git format-patch appropriately on
master, changes as separate patches one per feature branch or not.
Actually I'm not convinced it is possible, as that way you are
serializing merges, not all the past history of commits coming from
different feature branches, am I missing something?

Cheers.

-- 
Stefano Zacchiroli -*- PhD in Computer Science \ PostDoc @ Univ. Paris 7
zack@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
I'm still an SGML person,this newfangled /\ All one has to do is hit the
XML stuff is so ... simplistic  -- Manoj \/ right keys at the right time
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20080716/77c1f1b6/attachment.pgp