[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: Fixes in Git (first in stable, then merge to master)
From:       Nicolas Alvarez <nicolas.alvarez () gmail ! com>
Date:       2011-07-23 3:03:28
Message-ID: j0ddm1$1th$1 () dough ! gmane ! org
[Download RAW message or body]

David Jarvie wrote:
> On Saturday 23 July 2011 00:00:16 Nicolas Alvarez wrote:
> During the stable branch freeze before a minor version release (such as
> currently before the 4.7 release), it isn't possible to commit bug fixes
> to stable first and then merge to master. Only master can be committed to,
> so presumably we'll have to continue to commit to master and cherry-pick
> later once the freeze ends. Either that or change the policy on freezes.

You could branch 4.7 into (say) 4.7-fixes to do bugfixes during the freeze, 
and merge it back into 4.7 when the freeze ends.

-- 
Nicolas


[prev in list] [next in list] [prev in thread] [next in thread]