Changes between Version 42 and Version 43 of QtWebKitReleases
- Timestamp:
- Dec 10, 2012 3:53:12 AM (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
QtWebKitReleases
v42 v43 7 7 == Release branches == 8 8 9 === QtWebKit (5.0.x)as part of Qt 5.0.x ===9 === QtWebKit 5.0.x as part of Qt 5.0.x === 10 10 11 11 * Shipping as part of Qt 5.0's essential modules … … 51 51 There are two ways to integrate changes into a release branch: 52 52 53 * The commit is landed in trunk and then cherry-picked into the release branch. 54 * Time constraints prevent us from landing the patch and we have to include a change before landing it (exceptional patch, see below).53 * The commit is landed in trunk and then cherry-picked into the release branch. In Qt 5.x that is done through a submission into Qt's Gerrit. 54 * Time constraints prevent us from landing the patch and we have to include a change before landing it. 55 55 56 Exceptional patches must satisfy the following criteria before they are included in the release: 56 For Qt 5.x, the Gerrit installation of the Qt project is used for the maintenance of the stable and release branches. 57 57 58 * An entry with the attached patch is filed in bugs.webkit.org (using http://webkit.org/new-qtwebkit-bug); 59 * The patch has a ChangeLog entry; 60 * The changes are public and live on a gitorious branch, rebased with the targeted release; 61 * They should have a layout test included whenever possible; 62 * At least one WebKit reviewer signs off on the patch and no other reviewer objects; 63 * The bug is marked to block the tracker bug for patches pending trunk inclusion: https://bugs.webkit.org/show_bug.cgi?id=32653; 64 * Any exception has to be first discussed in the public mailing list; 58 Note for Qt Gerrit approvers: When accepting changes into the Gerrit managed branches of QtWebKit, it is your (the approver) responsibility to ensure that ... 65 59 66 After the release we have to make a concentrated effort in reducing the number of exceptional patches, by reviewing the changes in the bugs that the tracker bug ([https://bugs.webkit.org/show_bug.cgi?id=32653 32653]) depends on. 60 * ... the change is the result of a cherry-pick from a change landed upstream 61 * ... the change finds is way into WebKit trunk. 67 62 68 == Procedures for cherry-picking and weekly releasing == 63 '''Do not approve changes where it is not clear how the change finds its way into upstream trunk.''' 64 65 66 == QtWebKit 2.x: Procedures for cherry-picking and weekly releasing == 69 67 70 68 The process for cherry-picking changes from trunk to a stable branch is semi-automated with the use of {{{cherry-pick-into-release-branch.py}}} and the use of meta-bugs. To keep things working as expected and help the automation, some care must be taken when commiting changes in the branch. Below are the basic steps and the commands involved:
