This shows you the differences between two versions of the page.
Next revision | Previous revisionLast revisionBoth sides next revision | ||
test:pullrequests [2013/05/28 17:24] – created page for merging PRs rhauck | test:pullrequests [2013/07/18 12:42] – corrected the last part about merging - only required if there are multiple heads rhauck | ||
---|---|---|---|
Line 7: | Line 7: | ||
- Install hg-git, see: http:// | - Install hg-git, see: http:// | ||
- | * :!: 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, | + | * :!: 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: < |
+ | * :!: Be sure to add the hggit entry to your .hgrc file as docuemented on http:// | ||
- Turn on the ' | - Turn on the ' | ||
- If you don't already have one, clone the Mercurial repository: < | - If you don't already have one, clone the Mercurial repository: < | ||
Line 14: | Line 15: | ||
- In the test-github repository, pull from the repository listed in the Pull Request:< | - In the test-github repository, pull from the repository listed in the Pull Request:< | ||
* 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. | * 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 ' | + | * :!: Note: You may see a message like: < |
- | - Delete | + | - (Optional) To confirm you've pulled the changes from Github, compare your two local clones. |
- | - cd back to the 'test-master' | + | - Merge those commits |
- | - If there's only one head, continue to step 10, otherwise, merge the branch:< | + | - Commit |
+ | - Push to the test-master local clone < | ||
+ | - Switch | ||
+ | - (Optional) To confirm you've pulled the changes from the second local clone, again, compare your two local clones. < | ||
+ | - Check if the new branch created additional heads:< | ||
+ | cd ../ | ||
+ | hg heads | ||
+ | </ | ||
+ | - If there is more than one head, merge the branch: < | ||
+ | hg merge | ||
+ | hg commit -m " | ||
+ | - or possibly rebase it - | ||
+ | hg rebase | ||
+ | </ | ||
+ | - If there is only one head, continue to the next step | ||
- Push the changes to the server: < | - Push the changes to the server: < |