On the use of Git

[Desmond O. Chang]

Hi Peter,

On Wed, Sep 8, 2010 at 14:31, Peter Van Eynde <pvaneynd at debian.org> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Hello all,
>
> While working on clisp I noticed that our current strategy for Git
> slightly sucks.
>
> Currently we have upstream that moves forward with upstream and we pull
> this into master.
>
> The issue which I found is that often you have conflicts and you would
> like to use 'rebase' but that will cause problems for the people who are
> pulling the branch from alioth.
>
> Another issue is that often when resolving conflicts it is not clear
> where the conflict comes from. "Why do we change file xxx again?".
>
> As I am blocked by the freeze from uploading to unstable I wrote down a
> proposal for a new architecture in the wiki:
>
> http://wiki.debian.org/Teams/DebianCommonLisp/GitPackaging
>
> could you guys have a look at that and shoot down my stupidities?

There are too many branches.  We should use tag for each version.  The
'patch' and 'typo' branches are both unnecessary.  Using one
'packaging' branch is ok.  If you want to pick only a few patches from
the previous version, you can use 'cherry-pick'.

This is my workflow:

 --U1-------U2-------U3->upstream
    \        \        \
     D1-1     D2-1-----D3-1->master
      \       /
       D1-2--/

If you:

1. keep upstream just tracking;
2. keep debian/ only in master
3. don't touch the upstream code in master;
4. keep patches in debian/patches/

This will not cause conflicts.

Just my personal opinion.

>
> Peter
>
> PS: maybe we also need more 'admin' people for the mailing lists. Is
>    someone a volunteer to do this?

What should the admin do?  I'm not a DD, can I apply?


Thanks,
Des