Home Specs Ideas Testing About
You are here: CSS Working Group Wiki » Testing » Merging Pull Requests from Github to Mercurial

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
Next revisionBoth sides next revision
test:pullrequests [2013/05/29 15:34] – Corrected steps - no need to merge branches rhaucktest:pullrequests [2013/07/18 12:29] – Added note about the non-fatal bookmarks error rhauck
Line 7: Line 7:
  
   - Install hg-git, see: http://hg-git.github.io/    - 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   - 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>   - 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>   - 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.      * 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   - (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>   - Merge those commits <code>hg merge</code>
 
test/pullrequests.txt · Last modified: 2014/12/09 15:48 by 127.0.0.1
Recent changes RSS feed Valid XHTML 1.0 Valid CSS Driven by DokuWiki