Changes between Version 11 and Version 12 of QtWebKitReleases

Timestamp:

Oct 20, 2010, 10:22:09 AM (14 years ago)

Author:

Ademar Reis

Comment:

--

QtWebKitReleases

@@ -1 @@
-
 = Procedures and policies for releases of QtWebKit =
 
 Releases of QtWebKit are cut from WebKit's trunk. Some time before the release a new branch is created and hosted in a Git repository. After the release it becomes a maintenance branch.
+
+== Release branches and their status ==
+
+=== QtWebKit 2.0 ===
+
+'''Status''': released, maintainance
+
+ * Tracker bug for critical fixes: https://bugs.webkit.org/show_bug.cgi?id=35784
+
+=== QtWebKit 2.1 ===
+
+'''Status''': open, frozen (critical fixes only)
+
+ * Tracker bug for critical fixes: https://bugs.webkit.org/show_bug.cgi?id=39121
+ * Tracker bug for candidate fixes: https://bugs.webkit.org/show_bug.cgi?id=44677
 
 == Release branch creation ==
@@ -8 +22 @@
   * The release branch is hosted at http://gitorious.org/+qtwebkit-developers/webkit/qtwebkit
   * It is created off the {{{master}}} branch at http://gitorious.org/webkit
-  * Extra patches can be included in this branch (see https://bugs.webkit.org/show_bug.cgi?id=32653 )
   * Source packages are created from this branch. See [wiki:"QtWebKitPackaging" QtWebKitPackaging] for details and instructions for producing packages.
 
-== Getting changes into the release branch ==
+== Getting changes into a release branch ==
 
 After the release branch has been created there are two ways to integrate changes:
 
   * The commit is landed in the trunk and then it is cherry-picked into the release branch.
-  * Time constraints prevent us from landing the patch and we have to include a change before landing it (exceptional patch).
+  * Time constraints prevent us from landing the patch and we have to include a change before landing it (exceptional patch, see below).
 
 Exceptional patches must satisfy the following criteria before they are included in the release:
@@ -28 +41 @@
   * At least one WebKit reviewer signs off on the patch and no other reviewer objects.
   * The bug is linked from it's corresponding JIRA item at http://bugreports.qt.nokia.com/browse/QTWEBKIT
+  * The bug is marked to block the tracker bug for patches pending trunk inclusion: https://bugs.webkit.org/show_bug.cgi?id=32653
 
 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 (32653) depends on.