Re: names of distribution-branches in the git repository

[Sylvain Le Gall <gildor@debian.org>]

On 20-11-2010, Ralf Treinen <treinen@free.fr> wrote:
> Hi,
>
> these days we are (or ar least we should be) mostly using the experimental
> distribution for uploads. In that case it seems reasonable to put 
> modifications on a git branch that is specific to that distribution.
> This of course also applies to other branches, like for backporting.
>
> It would be nice if we could agree on canonical names for these branches
> in the git repository. Personally, I have been using "master-experimental",
> which is a PITA to type, but I also have seen "experimetal" which is 
> probably less acurate but much more convenient.
>
> I suggest that we add to the dom packaging reference that branches intended
> for primary release into a distribution should be named like that
> distribution, that is experimental, squeeze, whatever-backport, etc, with
> the exception that the branch for sid is called master. Does that sound
> reasonable?
>
> In that case I would also suggest that dom-git-checkout also pulls the
> experimental branch when it exists.
>
>


May I suggest my own summary, about this feature (trying to solve
conflicts between all opinions):
- in the Debian OCaml reference:
  - if we package something for anything else than sid:
    - create a set of branch $distrib/master, $distrib/upstream forked
      from the master, upstream branches (E.g. squeeze/master,
      squeeze/upstream)
    - set debian/gbp.conf accordingly (upstream-branch and
      debian-branch) 
    - the pristine-tar branch remains the same
- in dom-git-checkout:
  - if */master exists, display an information note listing other
    branches.  E.g.: You checkout master but experimental/master and
    squeeze/master also exists
  - add an option (-t $distrib) to fetch/checkout $distrib/upstream and
    $distrib/master, with a special keyword "all" that ifetch all
    $distrib
- in dom-new-git-repo:
  - add an option (-t $distrib) to fork upstream and master branches
    remotely and check them out locally.

What do you think about this?

Regards,
Sylvain Le Gall