[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: branching
From: |
Joseph Wakeling |
Subject: |
Re: branching |
Date: |
Fri, 29 Apr 2011 17:55:20 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110419 Lightning/1.0b2 Thunderbird/3.1.9 |
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.
Best wishes,
-- Joe
Re: branching, Matthias Kilian, 2011/04/15