Changes between Version 26 and Version 27 of QtWebKitReleases

Timestamp:

Sep 26, 2011 7:04:24 AM (13 years ago)

Author:

Ademar Reis

Comment:

--

QtWebKitReleases

@@ -68 +68 @@
   * If there's a conflict, the script will abort. In that case:
     * Solve the conflict ({{{git status, git rm, git add}}}, patch the files manually, etc -- your choice);
-    * Commit the changes, '''keeping the original changelog from the original git commit;'''
+    * Commit the changes with a standard {{{git commit}}} command. It'll keep the changelog from the original git commit plus a list of conflicting files, but '''you'll have to add a line "Author: Foo Bar <foobar@whatever.com>"''', otherwise you'll be listed as the commit author.
     * Run the script again, it'll detect the new commit and continue as expected.
   * '''Before letting the script add a comment to bugzilla, '''make sure the build is not broken and run some basic tests (run QtTestBrowser, the API tests -- your choice), so that if there's something broken, you can fix it and {{{git commit --amend}}} the changes before a reference is added to bugzilla.
@@ -74 +74 @@
   * Avoid adding extra commits in the branch, always prefer cherry-picks to keep cross references with what's in trunk.
   * If the patch is a backport, you're free to add your own changelog, but make sure there are at least two lines there: one with the bug title and one with the full bug URL;
-  * In case of doubts, follow the example of what's already there (see {{{git log}}}).
+  * In case of doubts, follow the example of what's already there (see {{{git log}}});
+  * Check [https://lists.webkit.org/pipermail/webkit-qt/2011-May/001560.html this thread about the usage of meta-bugs] on the !QtWebKit Mailing List.
+
 
 To create release notes reports (similiar to the ones posted weekly in the [http://www.google.com.br/search?q=qtwebkit+developer+journal QtWebKit Developer Journal]), run the {{{create-release-notes.py}}} (see {{{--help}}}). Usually it looks like this: