[asterisk-dev] Asterisk 1.6 Release Management Proposal

[Michiel van Baak]

On 14:22, Wed 17 Oct 07, Russell Bryant wrote:
> Michiel van Baak wrote:
> > Not really important for me because I dont have commit
> > access but I wonder how the merging from 1.4 to 1.6 to trunk
> > will go. I know how it works now (commit to 1.4 and block in
> > trunk otherwise it will go to trunk 'automagically').
> > 
> > Will there be branches with automerge from a 1.6.X
> > subrelease?
> 
> Actually, we don't use automerge for trunk.  The only place automerge is used is
> in the developer branch area (team/ directory).
> 
> Regarding merge order, the only change is that there may be one additional
> commit required, if the patch fixes a regression introduced in the 1.6.X branch
> that is in testing.  So, where now a change goes through:
> 
> 1.4 ---> trunk
> 
> it may now go:
> 
>     |---> 1.6.X
> 1.4 |---> trunk

Makes sence.
Some patches will need 3 additional commits right?
bugfixes to critical bugs that are in all 1.6 versions
should go to 3 1.6 releases.

Just trying to get the whole picture here.
> 
> Hopefully my lame ASCII art makes sense ...
lol :)

-- 

Michiel van Baak
michiel at vanbaak.eu
http://michiel.vanbaak.eu
GnuPG key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x71C946BD

"Why is it drug addicts and computer afficionados are both called users?"