[Releasing] [Development] HEADS UP: Qt 5.2.1 - merge stable into release

[Frederik Gladhorn]

Tirsdag 14. januar 2014 09.38.35 skrev Simon Hausmann:
> On Tuesday 14. January 2014 06.02.36 Paaso Matti wrote:
> > Hi,
> > 
> > All merges are now done, so all changes required for Qt 5.2.1 need
> > to be pushed to the 'release' branch from now on.
> 
> Great, thanks for the merges.
> 
> Could you re-enable the stage button in Gerrit for the stable branches,
> please?

Done.

Cheers,
Frederik


> 
> Thanks,
> Simon
> 
> > Only changes fixing P0 or P1 (and really important P2) can be pushed
> > 
> > directly to the release branch.
> > 
> > Changes in the release branch need to be reviewed as usual, but only the
> > release team <https://codereview.qt-project.org/#admin,group,61> can
> > stage them.
> > 
> > Staging once a day -every morning- works quite well, so I'd
> > propose the same now.
> > 
> > Changes in the current 'stable' branch will be part of a future Qt
> > release.
> > 
> > Cheers,
> > --
> > Matti Paaso
> > Digia, Qt
> > 
> > 
> > From: Paaso Matti
> > Sent: 13. tammikuuta 2014 13:04
> > To: Paaso Matti; development at qt-project.org
> > Cc: releasing at qt-project.org
> > Subject: RE: HEADS UP: Qt 5.2.1 - merge stable into release
> > 
> > Hi,
> > 
> > Just a reminder: stable->release merge is ongoing. Still waiting for last
> > staged changed to be integrated, and after that we can proceed with the
> > merge. There seems to be some changes in stable which are not staged, so
> > those changes has to be submitted into release -branch if change needs to
> > be in 5.2.1.
> > 
> > BR,
> > Matti Paaso
> > 
> > 
> > 
> > From: development-bounces+matti.paaso=digia.com at qt-project.org
> > [mailto:development-bounces+matti.paaso=digia.com at qt-project.org] On
> > Behalf
> > Of Paaso Matti Sent: 3. tammikuuta 2014 15:36
> > To: development at qt-project.org
> > Cc: releasing at qt-project.org
> > Subject: [Development] HEADS UP: Qt 5.2.1 - merge stable into release
> > 
> > Hi,
> > 
> > We are about to start the "Qt 5.2.1" release as agreed in [1], which means
> > that:
> > 
> > - We plan to do a fast-forward merge from 'stable' into 'release' branch
> > on Jan 13th.
> > 
> > - After Jan 13th any changes that are required for 5.2.1 need to be
> > pushed to the 'release' branch. So if your changes are not in by that
> > day, please wait until the merge is done and re-target them to the
> > 'release' branch.
> > 
> > The repositories that will be part of the Qt 5.2.1 release merge are:
> > 
> > - qt5
> > - qtactiveqt
> > - qtandroidextras
> > - qtbase
> > - qtconnectivity
> > - qtdeclarative
> > - qtdoc
> > - qtgraphicaleffects
> > - qtimageformats
> > - qtlocation
> > - qtmacextras
> > - qtmultimedia
> > - qtquick1
> > - qtquickcontrols
> > - qtscript
> > - qtsensors
> > - qtserialport
> > - qtsvg
> > - qttools
> > - qttranslations
> > - qtwebkit
> > - qtwebkit-examples
> > - qtwinextras
> > - qtxmlpatterns
> > - qtx11extras
> > 
> > [1]:
> > http://lists.qt-project.org/pipermail/releasing/2013-December/001557.html
> > 
> > Cheers,
> > --
> > Matti Paaso
> > SW Engineer - Digia, Qt
> 
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development

-- 
Best regards,
Frederik Gladhorn
Senior Software Engineer - Digia, Qt
Visit us on: http://qt.digia.com