Changes between Version 28 and Version 29 of QtWebKitReleases

Timestamp:

Sep 26, 2011, 7:22:39 AM (13 years ago)

Author:

Ademar Reis

Comment:

--

QtWebKitReleases

@@ -63 +63 @@
   * Clone the [http://gitorious.org/webkit/ qtwebkit git/svn mirror] and keep it up to date;
   * Downloand and setup [http://gitorious.org/qtwebkit/tools qtwebkit/tools] (change PATH and PYTHONPATH as necessary);
-  * Check [wiki:UsingGitWithWebKit] for valuable tips and tricks;
+  * Check [wiki:UsingGitWithWebKit] and [http://gitorious.org/webkit/pages/UsingMirrorWithGitSvn UsingMirrorWithGitSvn] for valuable tips and tricks;
   * Set your username and password in git-config (see instructions in the link above);
   * From the branch where you want to cherry-pick a change ({{{git new-workdir}}} is your friend), run {{{cherry-pick-into-release-branch.py}}} (see {{{--help}}}). This script will parse bugzilla, ask for cherry-picks, add comments and remove bugs from their trackers;
   * 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 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.
+    * 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.