On the use of Git

[Desmond O. Chang]

Hi,

On Tue, Sep 14, 2010 at 03:22, Peter Van Eynde <pvaneynd at mailworks.org> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Hello Desmond,
>
> Thanks for your comments!
>
> On 11/09/10 11:26, Desmond O. Chang wrote:
>> 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'.
>
> Unless I'm mistaken you can only cherry-pick into a new branch, or when
> you are rebasing.
>
> As the master branch would be publicaly available this would ruin the
> work of anybody who was working on master or a branch of master.
>
> Not?
>
>>
>> This is my workflow:
>>
>>  --U1-------U2-------U3->upstream
>>     \        \        \
>>      D1-1     D2-1-----D3-1->master
>>       \       /
>>        D1-2--/
>>
>
> So I started working on master at 'D1-2' what will happen if I 'pull'
> the branch again from alioth?
>
> (Honestly I prefer your way, but this seems difficult in a distributed
> development architecture)

What about this model:

 --U1---------U2--------U3-------U4---->upstream
    \          \         \        \
     D1-1       D2-1------D3-1-----D4-1--->master (or sid)
      \        /           \
       D1-2----             squeeze
        \
         D1-3-->lenny

E.g., We create the branch 'lenny' at D1-2 when lenny is released.  If
you want to make a stable upload, you should work on 'lenny',
otherwise you should work on master.  If you think some commits
between D1-2 and D1-3 are useful, cherry-pick them.