Merging Pull Requests from Github to Mercurial

All submissions to Mercurial are mirrored on Github and refreshed every few minutes. If contributors wish to submit tests directly to Github (bypassing setting up Mercurial), they may do so and their submissions are handled through pull requests. The process for submitting new tests through Github is documented here.

The steps for merging the pull requests back into Mercurial are as follows:

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:

If you already have a clone, make sure it's in sync with the server: (i.e. 'hg stat' to make sure you have no outstanding changes; 'hg out' to make sure you have no unpushed changesets, push them now if you do; 'hg pull -u'; alternatively, just make a fresh clone…)

Create a second local clone of the test repository:

cd <the directory that contains 'test-master'>

hg clone test-master test-github

In the test-github repository, pull from the repository listed in the Pull Request:

cd test-github

hg pull git://github.com/<git_user>/csswg-test.git

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:

creating bookmarks failed, do you have bookmarks enabled?

This can be safely ignored.

(Optional) To confirm you've pulled the changes from Github, compare your two local clones.