Differences

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

--- test:pullrequests [2013/07/18 10:18] – rhauck
+++ test:pullrequests [2014/12/09 15:48] (current) – external edit 127.0.0.1
@@ Line 15: / 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.
+    * :!: Note: You may see a message like: <code>creating bookmarks failed, do you have bookmarks enabled? </code> This can be safely ignored.
   - (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
   - Merge those commits <code>hg merge</code>
@@ Line 20: / Line 21: @@
   - 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
+  - (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 plus the your commit from the merge in the step above.
-  - Merge those commits into your test-master clone <code>hg merge</code>
+  - Check if the new branch created additional heads:<code>
-  - Commit the merge <code>hg commit -m "Merging local clones"</code>
+cd ../test-master
+hg heads
+</code>
+  - If there is more than one head, merge the branch: <code>
+hg merge
+hg commit -m "Merging PR # xxx"
+- or possibly rebase it -
+hg rebase
+</code>
+  - If there is only one head, continue to the next step
   - Push the changes to the server: <code>hg push</code>