This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
tools:hg [2013/09/11 05:31] – [Setting Up Mercurial Preferences] add rebase extension note hober | tools:hg [2015/01/30 16:06] – [Setting Up Mercurial Preferences] plinss | ||
---|---|---|---|
Line 15: | Line 15: | ||
==== Installing Mercurial ==== | ==== Installing Mercurial ==== | ||
- | You need to first [[tools: | + | You need to first [[tools: |
You can see if you already have Mercurial installed by opening up a command shell and typing: | You can see if you already have Mercurial installed by opening up a command shell and typing: | ||
Line 25: | Line 25: | ||
< | < | ||
- | Mercurial Distributed SCM (version 2.5.1) | + | Mercurial Distributed SCM (version |
(see http:// | (see http:// | ||
</ | </ | ||
Line 56: | Line 56: | ||
mq = | mq = | ||
graphlog = | graphlog = | ||
+ | progress = | ||
+ | bookmarks = | ||
+ | color = | ||
| | ||
[auth] | [auth] | ||
- | # CSSWG Test Repository | + | # CSSWG Test & Draft Repositories |
csswg.prefix = https:// | csswg.prefix = https:// | ||
csswg.username = your_csswg.org_username | csswg.username = your_csswg.org_username | ||
csswg.password = your_csswg.org_password #optional | csswg.password = your_csswg.org_password #optional | ||
| | ||
- | # CSSWG Spec Repository | + | # FXTF Draft Repository |
+ | fxtf.prefix = https:// | ||
+ | fxtf.username = your_csswg.org_username | ||
+ | fxtf.password = your_csswg.org_password #optional | ||
+ | |||
+ | # CSS-Houdini TF Draft Repository | ||
+ | houdini.prefix = https:// | ||
+ | houdini.username = your_csswg.org_username | ||
+ | houdini.password = your_csswg.org_password #optional | ||
+ | |||
+ | # Other W3C Spec Repositories | ||
w3c.prefix = https:// | w3c.prefix = https:// | ||
w3c.username = your_w3.org_username | w3c.username = your_w3.org_username | ||
Line 89: | Line 102: | ||
Depending on your OS and Mercurial root certificate configuration you may get a warning message about the host certificate when communicating with the central repository. If that happens, you can remove those warnings by adding the following to your configuration file: | Depending on your OS and Mercurial root certificate configuration you may get a warning message about the host certificate when communicating with the central repository. If that happens, you can remove those warnings by adding the following to your configuration file: | ||
[hostfingerprints] | [hostfingerprints] | ||
- | dvcs.w3.org = f8:9e:e9:55:14:2d:6f:3c:d4:f0:ad:33:fc:7b:7b:26:c0:17:53:d9 | + | dvcs.w3.org = 14:A5:F7:99:95:F8:41:9B:02:71:2C:4B:87:D2:E0:8B:F2:CF:4B:A3 |
- | hg.csswg.org = d4:c1:da:a9:ea:bc:49:25:4b:df:af:4a:a9:b4:6f:ea:51:33:3d:b8 | + | hg.csswg.org = 71:06:B1:F3:E4:74:AB:53:C2:CE:8E:BF:99:7D:F8:B4:4C:22:E8:B9 |
- | + | | |
- | Note that these fingerprints will only be valid until the certificates expire (dvcs.w3.org expires 03-may-2014, hg.csswg.org expires expires | + | hg.css-houdini.org = 20: |
+ | |||
+ | Note that these fingerprints will only be valid until the certificates expire (dvcs.w3.org expires 03-may-2016, hg.csswg.org expires expires | ||
Alternatively (and better if you're on an OS where this is easy), you can avoid ever having to add fingerprints by following [[http:// | Alternatively (and better if you're on an OS where this is easy), you can avoid ever having to add fingerprints by following [[http:// | ||
Line 128: | Line 143: | ||
</ | </ | ||
- | ** Resources directory (needed when authoring | + | ** Resources directory (for script tests) ** |
+ | |||
+ | This directory contains testharness.js which is needed if you'll be running script tests locally. This is maintained in a separate repository in GitHub. See the [[https:// | ||
< | < | ||
cd / #not required, but resources directory is located at root level in repository | cd / #not required, but resources directory is located at root level in repository | ||
- | hg clone https://dvcs.w3.org/hg/resources/ | + | git clone https://github.com/w3c/testharness.js.git |
</ | </ | ||
- | ** CSSWG Spec Repository ** | + | ** CSSWG Draft Repository ** |
< | < | ||
- | cd /mirror/hg/dvcs.w3.org/ #just an example, pick your own local directory | + | cd /mirror/hg.csswg.org/ #just an example, pick your own local directory |
- | hg clone https://dvcs.w3.org/hg/csswg/ | + | hg clone https://hg.csswg.org/drafts/ |
</ | </ | ||
- | ** FXTF Spec Repository ** | + | ** FXTF Draft Repository ** |
< | < | ||
- | hg clone https://dvcs.w3.org/hg/FXTF/ | + | hg clone https://hg.fxtf.org/drafts/ |
</ | </ | ||
Line 154: | Line 171: | ||
Note: By default, the working directory name will match the name of the central repository on the server (the last path component of the URL). If you want to use a different name for your working directory, enter it at the end of the clone command, e.g.: | Note: By default, the working directory name will match the name of the central repository on the server (the last path component of the URL). If you want to use a different name for your working directory, enter it at the end of the clone command, e.g.: | ||
< | < | ||
- | hg clone https://dvcs.w3.org/hg/csswg/ specs | + | hg clone https://hg.csswg.org/drafts/ csswg |
</ | </ | ||
Line 161: | Line 178: | ||
All of our repositories are readable by anyone. Permission to write (i.e. push) into the repositories is restricted to certain users. | All of our repositories are readable by anyone. Permission to write (i.e. push) into the repositories is restricted to certain users. | ||
- | Access to the CSSWG Test Suite Repository | + | Access to the repositories on hg.csswg.org, |
+ | |||
+ | In addition to the Test Suite Repository, all CSSWG members should have write access to the CSSWG Draft Repository, all CSSWG and SVGWG members should have write access to the FXTF and CSS-Houdini TF Draft Repositories. If you need write access and don't already have it, you can submit a request on the [[https:// | ||
- | Access to the CSSWG or FXTF Spec Repositories | + | Access to the repositories on dvcs.w3.org |
===== Working With Mercurial ===== | ===== Working With Mercurial ===== | ||
Line 313: | Line 332: | ||
At this point your changes will be available on the server to other users. | At this point your changes will be available on the server to other users. | ||
+ | |||
+ | |||
+ | :?: If you see a message similar to: " | ||
+ | |||
=== Merging Branches of Work: hg merge === | === Merging Branches of Work: hg merge === | ||
Line 506: | Line 529: | ||
Use '' | Use '' | ||
+ | |||
+ | If you need to edit history, e.g. undo/drop your latest change set, see: | ||
+ | * http:// | ||
+ | In particular, '' | ||
===== CVS / Subversion Cheat Sheet ===== | ===== CVS / Subversion Cheat Sheet ===== | ||
Line 511: | Line 538: | ||
If you are used to using Subversion or CVS, the following commands are roughly equivalent: | If you are used to using Subversion or CVS, the following commands are roughly equivalent: | ||
- | cvs update | + | cvs update |
cvs commit | cvs commit | ||
cvs stat == svn status | cvs stat == svn status |