5.6 branching is now complete (*). anything that integrates to dev now is 5.7 material - as usual, no cherry-picks.
(*) well, actually, it's, not, because the qtbase downmerge is non-trivial and needs a review and an integration run, but that's relevant only for RM, not for the developers. a mini-post-mortem already: as every single time so far, something went wrong with the supermodule (this time it was bad versioning in canvas3d, which repeatedly threw off the branch/merge script). for a smooth process, it's really essential that the supermodule and all submodules are in a consistent state *before* the branching *starts*. take that as a reminder that if you are adding a new module to the supermodule, it's your responsibility to verify that the module is actually built in a sane way within the new context. On Fri, Aug 07, 2015 at 10:06:33AM +0000, Heikkinen Jani wrote: > Hi all, > > > As far as I know there shouldn't be anything preventing us to have FF & start > branching on Monday 10th Aug as planned. There is still work to do in new CI > side but that shouldn't prevent us to proceed with FF. > > > Qt5.git update isn't working in 'dev' yet but after discussion with Lars & > others internally we agreed it isn't a blocker for FF & branching. Of course > it needs to be working before alpha release (which is planned to happen 8th > September). > > > So if nothing new turns out later today/during the weekend Qt 5.6 feature > freeze is on Monday morning and we will start branching. We will use soft > branching like earlier so there should be enough time to finalize ongoing > changes for Qt 5.6 in 'dev' & start using '5.6' branch for Qt 5.6 > development. And like earlier final downmerge from 'dev' to '5.6' will happen > ~ after a week (Most probably Monday 17th Aug). > > > So please avoid creating new changes in 'dev' during next week, just finalize > ongoing changes there & start using '5.6' instead. 'dev' will be "open" for > new changes (new features etc) targeting to Qt 5.7 release after the final > downmerge. > > > br, > > Jani > > ________________________________ > Lähettäjä: Heikkinen Jani > Lähetetty: 3. elokuuta 2015 13:55 > Vastaanottaja: [email protected] > Kopio: [email protected] > Aihe: HEADS-UP: Qt 5.6 feature freeze and branching coming > > > Hi all, > > > According to Qt 5.6 schedule (http://wiki.qt.io/Qt-5.6-release) feature > freeze & branching from 'dev' to '5.6' should happen next Monday (10.8.2015). > How it seems, are we ready for FF after a week? > > > - Are all new modules in 'dev' already now? should be, see > http://lists.qt-project.org/pipermail/development/2015-June/021809.html > > - Are all mandatory new features in 'dev' now or coming in within a week? > > - Are new modules & features fulfilling FF criteria, see > http://wiki.qt.io/Qt5_feature_freeze > > (* List of new features in Qt 5.6 seems to be quite short, see > http://wiki.qt.io/New_Features_in_Qt_5.6 so it should be quite easy to do the > FF ;) Or the page needs some updates from feature/module owners...) > > > Is there something which prevents us to proceed as planned? Is new CI system > working well enough etc? Is Qt5.git update working ok in dev? > > > I notice from https://codereview.qt-project.org/#/c/121238/ : > > Simon Hausmann > Jul 24 5:41 AM > > Patch Set 31: Code-Review-2 > > Updates will be different > > > br, > > Jani > _______________________________________________ > Development mailing list > [email protected] > http://lists.qt-project.org/mailman/listinfo/development _______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
