Changes between Version 11 and Version 12 of QtWebKitReleases


Ignore:
Timestamp:
Oct 20, 2010 10:22:09 AM (13 years ago)
Author:
Ademar Reis
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • QtWebKitReleases

    v11 v12  
    1 
    21= Procedures and policies for releases of QtWebKit =
    32
    43Releases 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.
     4
     5== Release branches and their status ==
     6
     7=== QtWebKit 2.0 ===
     8
     9'''Status''': released, maintainance
     10
     11 * Tracker bug for critical fixes: https://bugs.webkit.org/show_bug.cgi?id=35784
     12
     13=== QtWebKit 2.1 ===
     14
     15'''Status''': open, frozen (critical fixes only)
     16
     17 * Tracker bug for critical fixes: https://bugs.webkit.org/show_bug.cgi?id=39121
     18 * Tracker bug for candidate fixes: https://bugs.webkit.org/show_bug.cgi?id=44677
    519
    620== Release branch creation ==
     
    822  * The release branch is hosted at http://gitorious.org/+qtwebkit-developers/webkit/qtwebkit
    923  * It is created off the {{{master}}} branch at http://gitorious.org/webkit
    10   * Extra patches can be included in this branch (see https://bugs.webkit.org/show_bug.cgi?id=32653 )
    1124  * Source packages are created from this branch. See [wiki:"QtWebKitPackaging" QtWebKitPackaging] for details and instructions for producing packages.
    1225
    13 == Getting changes into the release branch ==
     26== Getting changes into a release branch ==
    1427
    1528After the release branch has been created there are two ways to integrate changes:
    1629
    1730  * The commit is landed in the trunk and then it is cherry-picked into the release branch.
    18   * Time constraints prevent us from landing the patch and we have to include a change before landing it (exceptional patch).
     31  * Time constraints prevent us from landing the patch and we have to include a change before landing it (exceptional patch, see below).
    1932
    2033Exceptional patches must satisfy the following criteria before they are included in the release:
     
    2841  * At least one WebKit reviewer signs off on the patch and no other reviewer objects.
    2942  * The bug is linked from it's corresponding JIRA item at http://bugreports.qt.nokia.com/browse/QTWEBKIT
     43  * The bug is marked to block the tracker bug for patches pending trunk inclusion: https://bugs.webkit.org/show_bug.cgi?id=32653
    3044
    3145After 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.