Hi all, Unfortunately we haven't been able to start merge from dev branch to stable yet. One merge conflict needs to be solved still but now it seems we have fix available and I am really hoping we can start merge later today.
Matti will inform you when merge is done. Br, Jani From: Heikkinen Jani Sent: 17. helmikuuta 2014 9:16 To: Paaso Matti; [email protected] Cc: [email protected] Subject: RE: [Development] HEADS UP: merge stable into release and dev into stable Hi all, It seems we cannot start merge from dev branch to stable at the moment because there is still some issues to be solved before that: 1. There seems to be compilation break in dev branch, see https://codereview.qt-project.org/#change,78283. That needs to be solved first 2. There is still some merges ongoing from stable to dev branch * https://codereview.qt-project.org/#change,77965 * https://codereview.qt-project.org/#change,77972 * https://codereview.qt-project.org/#change,77977 * https://codereview.qt-project.org/#change,77258 3. Adding qtwebsockets as a submodule is still ongoing, see https://codereview.qt-project.org/#change,76844 4. Merge from stable to release needs to be done before merge from dev to stable. According to my understanding there isn't any blockers to do merge from stable to release. That will be started soon... There seems to be also lots of not integrated changes in dev branch at the moment but feature freeze date is gone and so on features for 5.3 should be "locked". Finalizing new features & 5.3 release continues in stable branch after the merge so let's put all effort to fix those remaining merge blockers to be able to do the merge as soon as possible. Br, Jani From: [email protected] [mailto:[email protected]] On Behalf Of Paaso Matti Sent: 11. helmikuuta 2014 11:52 To: [email protected] Cc: [email protected] Subject: [Development] HEADS UP: merge stable into release and dev into stable Hi, We plan to merge 'dev' branch (5.3) into stable branch on February 17th. And at the same time stable branch (5.2.2) is planned to be merged into release branch. This means that: -If there is a need for 5.2.2 release, content will be ready in release branch. -5.3.0 release content will be in stable branch. After merge any changes that are required for 5.2.2 need to be pushed to the 'release' branch and changes that are required for 5.3 need to be pushed to the 'stable' branch. So if your changes are not in by that day, please wait until the merge is done and re-target it to the correct branch. The repositories that will be part of the merges 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 Is there a new repositories planned to be included into 5.3.0? If so, stable branch for those has to be created if not exist yet. [1] http://lists.qt-project.org/pipermail/releasing/2014-February/001595.html Cheers, -- Matti Paaso SW Engineer - Digia, Qt
_______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
