[Development] Branching 5.0

[Thiago Macieira]

On domingo, 2 de dezembro de 2012 14.52.12, Knoll Lars wrote:
> > Most of the pending changes in master today are fixes that need to go into
> > the  5.0 release, so the branch should be merged to stable, not dev.
> 
> I have been seeing lots of pending changes in master that are 5.1 material
> and being held back. So this way seems to be the safer approach.
> 
> Merging to stable has the disadvantage that we don't see what's going to be
> in 5.0, so I would prefer to rather make it explicit. Pushing changes to
> stable is not such a big problem.

We can finish the 5.0 changes in master for a week, merge that to stable, then 
open it for the queued 5.1 changes and merge that.

Note that most of the 5.1 changes have a "WIP" in their names and will require 
re-pushing to Gerrit for a new commit message. Isn't that prevented by Gerrit?
-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.qt-project.org/pipermail/development/attachments/20121202/6735aee7/attachment.sig>