Re: branching

[Carl Sorensen]

On 4/29/11 9:55 AM, "Joseph Wakeling" <address@hidden> wrote:

> On 04/15/2011 07:05 PM, Carl Sorensen wrote:
>> Just to be sure I understand correctly, the only things I will cherry-pick
>> into stable/2.14 will be bugfixes for critical bugs.
> 
> Just as a remark, I wonder if you may find it easier to adopt an
> alternative workflow:
> 
>    -- bugfix gets applied first in 2.14 branch
> 
>    -- bugfix gets merged into master dev branch
> 
> .... since that probably reduces the amount of cherry-picking that's
> needed -- I expect that probably almost every patch applied to 2.14 is
> also applicable to dev, but not vice versa.


This might work, but fails to meet the major criterion of the proposed
branching scheme.  The proposal is to make 2.14 stable.

Actually, I think your final comment is backwards.  Every patch is
applicable to dev, but only some are applicable to 2.14.

Thanks,

Carl