On Mon, May 27, 2013 at 03:01:51PM +0000, Ahumada Sergio wrote: > Hi, > > The merge from stable to release will happen tomorrow Tue 28th May. > > The plan is the following: > > - We will block the "Merge Patch Set X to Staging" button for all the > repositories listed below. > this refers to the stable branches, obviously. this is the same procedure we went through with dev when we merged it down a few weeks ago, to avoid that changes get merged to the wrong branch and need to be cherry-picked. changes really meant for 5.1.1 can be immediately staged by administrators, but you are probably not in such a hurry that you would need to bother us. ^^
> - We will wait for changes still under test until they are all merged and/or > back to Review in Progress > - We will proceed with the merge for all the repositories listed below > - We will leave the "Merge Patch Set X to Staging" blocked for around a day > > If your changes didn't make it and they are meant for Qt 5.1.0 please > re-target them to the release branch after the merges are done. > > New changes fixing P0 or P1 can be pushed directly to the release branch > after the merges are done. > > Cheers, > -- > Sergio Ahumada > Release Engineer - Digia, Qt > > ________________________________________ > From: [email protected] > [[email protected]] on behalf of > Sergio Ahumada [[email protected]] > Sent: Thursday, May 23, 2013 10:32 > To: [email protected] > Cc: [email protected] > Subject: [Development] HEADS UP: Qt 5.1.0 RC1 - merge stable into release > > Hi, > > We are about to start "Qt 5.1.0 RC1" release, which means that: > > - We plan to do a fast-forward merge from 'stable' into 'release' branch > on May 27th. So no CI involved here [1]. > > - After May 27th any changes that are required for 5.1.0 need to be > pushed to the 'release' branch. So if your changes are not in by that > day, please wait after the merge is done and re-target it to the > 'release' branch. > > - Please note that string freeze will happen together with the merge. So > if you have changes to the localized content, please stage them to > 'stable' branch immediately. [2] > > The repositories that will be part of the Qt 5.1.0 RC1 release merge are: > > - qtactiveqt > - qtbase > - qtdeclarative > - qtdoc > - qtgraphicaleffects > - qtimageformats > - qtjsbackend > - qtmultimedia > - qtquick1 > - qtquickcontrols > - qtscript > - qtsensors > - qtserialport > - qtsvg > - qttools > - qttranslations > - qtwebkit > - qtwebkit-examples > - qtxmlpatterns > - qtx11extras > > Cheers, > > [1]: http://lists.qt-project.org/pipermail/releasing/2013-May/001279.html > [2]: http://lists.qt-project.org/pipermail/localization/2013-May/000031.html > -- > Sergio Ahumada > Release Engineer - Digia, Qt > _______________________________________________ > 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 _______________________________________________ Releasing mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/releasing
