[Development] [HEADS UP] new branching scheme: 5.3 branches created, stable deprecated

[Oswald Buddenhagen]

On Fri, Jun 06, 2014 at 11:38:34AM +0200, Kurt Pattyn wrote:
> Just for clarity:
> * Is the release branch gone for developers?
>
it's gone for everyone. it has been deleted.
the next release branch will be 5.3.1, and you will push for it if you
have critical changes for that release. just as before.

> * And is there only one dev branch? Suppose 5.4 is in the make and meanwhile a 5.3.x patch release is being worked upon,
> where will the dev branch end up? Or should we just push our patches to the 5.3.x in that case?
> 
uhm ... huh?

i'm amazed by what twisted ideas people come up, given that we are
switching to a branching model which almost every other project on the
planet uses, including qt creator ...

now on to hacking the wiki ...

> Cheers,
> 
> Kurt
> 
> On 06 Jun 2014, at 08:37, Knoll Lars <Lars.Knoll at digia.com> wrote:
> 
> > On 06/06/14 08:20, "Thiago Macieira" <thiago.macieira at intel.com> wrote:
> > 
> >> Em sex 06 jun 2014, às 14:00:19, Yuchen Deng escreveu:
> >>> I'd say, the 'dev' even does not be a complete words.  so run a poll
> >>> sounds
> >>> be fair.
> >> 
> >> Let's run at QtCS next week. I don't think we'll ever get a better
> >> sampling of 
> >> people involved in Qt development.
> >> 
> >> Someone who feels strongly about the renaming should conduct a quick show
> >> of 
> >> hands during the plenary session.
> > 
> > I don’t see why we’d need to rename dev. Nothing has changed for that
> > branch. It has exactly the same meaning as before, and the same workflow.
> > 
> > We have changed the other ones because we have a different scheme how we
> > create these branches and merge between them.
> > 
> > And for those confused where to push their changes:
> > 
> > * If you were before pushing to dev, continue to do so.
> > * If you were pushing to stable, push to 5.3 (Later on, you might have a
> > choice of pushing to 5.3 or 5.4 depending on whether it’s critical enough
> > to do another release of 5.3 as well once we have 5.4 out).
> > * If we have a 5.x.y branch available (because we’re in the process of
> > preparing a release), and you have a fix for a showstopper for that
> > release, push to the 5.x.y branch.
> > 
> > Cheers,
> > Lars
> > 
> > _______________________________________________
> > Development mailing list
> > Development at qt-project.org
> > http://lists.qt-project.org/mailman/listinfo/development
> 
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development