Differences

This shows you the differences between two versions of the page.

--- test:pullrequests [2013/05/28 17:24] – created page for merging PRs rhauck
+++ test:pullrequests [2013/07/18 10:18] – rhauck
@@ Line 7: / Line 7: @@
   - Install hg-git, see: http://hg-git.github.io/
-      * :!: Important: Do not install the latest version as there are known problems. Instead, install version 0.3.4, which has been tested to work with the latest version of Mercurial, like so: <code>easy_install hg-git==0.3.4</code>
+      * :!: Important: Do not install the latest version as there are known problems. Instead, install version 0.3.4, which has been tested to work with the latest version of Mercurial. For example, if you used easy_install, do: <code>easy_install hg-git==0.3.4</code>
+      * :!: Be sure to add the hggit entry to your .hgrc file as docuemented on http://hg-git.github.io/
   - Turn on the 'progress' extension: http://mercurial.selenic.com/wiki/ProgressExtension
   - If you don't already have one, clone the Mercurial repository: <code> hg clone https://hg.csswg.org/test test-master </code>
@@ Line 14: / Line 15: @@
   - In the test-github repository, pull from the repository listed in the Pull Request:<code>cd test-github</code><code>hg pull git://github.com/<git_user>/csswg-test.git</code>
     * The first time you do this will take a loooong time as it exports the hg data to git format (long as in 3-4 hours, the progress extension helps you see what's going on). This is a one-time operation; subsequent pull requests happen quickly.
-    * Push the Pull Request branch into the 'test-master' repository: <code>hg push -B <branch_name> ../test-master  (<branch_name> should be 'submissions/<git_user>')</code>
+  - (Optional) To confirm you've pulled the changes from Github, compare your two local clones. <code>hg out</code> You should see all of the commits that are in the Pull Request
-  - Delete the bookmark created for the new branch: <code>hg bookmark -d <branch_name></code>
+  - Merge those commits <code>hg merge</code>
-  - cd back to the 'test-master' repository and check if the new branch created additional heads:<code>cd ../test-master</code><code>hg heads</code>
+  - Commit the merge <code>hg commit -m "Merging PR #XX - https://github.com/w3c/csswg-test/pull/XX"</code>
-  - If there's only one head, continue to step 10, otherwise, merge the branch:<code>hg merge</code><code>hg commit -m "Merging PR # xxx"</code> - or possibly rebase it  <code>hg rebase</code>
+  - Push to the test-master local clone <code>hg push ../test-master/</code>
+  - Switch to the root directory of the test-master <code>cd ../test-master/</code>
+  - (Optional) To confirm you've pulled the changes from the second local clone, again, compare your two local clones. <code>hg out</code> Again, you should see all of the commits that are in the Pull Request
+  - Merge those commits into your test-master clone <code>hg merge</code>
+  - Commit the merge <code>hg commit -m "Merging local clones"</code>
   - Push the changes to the server: <code>hg push</code>