This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
tools:hg [2014/12/30 22:54] – [Setting Up Mercurial Preferences] plinss | tools:hg [2017/01/30 16:55] (current) – plinss | ||
---|---|---|---|
Line 56: | Line 56: | ||
mq = | mq = | ||
graphlog = | graphlog = | ||
+ | progress = | ||
+ | bookmarks = | ||
+ | color = | ||
| | ||
[auth] | [auth] | ||
Line 97: | Line 100: | ||
** Avoiding Fingerprint Warnings (and improving security)** | ** Avoiding Fingerprint Warnings (and improving security)** | ||
- | 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, | + | 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, |
- | | + | |
- | dvcs.w3.org = 14: | + | |
- | hg.csswg.org = 71: | + | |
- | hg.fxtf.org = B9: | + | |
- | hg.css-houdini.org = 20: | + | |
- | + | ||
- | Note that these fingerprints will only be valid until the certificates expire (dvcs.w3.org expires 03-may-2016, | + | |
- | + | ||
- | Alternatively (and better if you're on an OS where this is easy), you can avoid ever having to add fingerprints by following | + | |
</ | </ | ||
Line 140: | Line 134: | ||
</ | </ | ||
- | ** 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 166: | Line 162: | ||
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 173: | Line 169: | ||
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, |
- | Access | + | In addition |
+ | |||
+ | Access to the repositories on dvcs.w3.org is controlled by your W3C user account. If you're not a member of the appropriate group and need write access, please email [[mailto: | ||
===== Working With Mercurial ===== | ===== Working With Mercurial ===== | ||
Line 325: | Line 323: | ||
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 518: | Line 520: | ||
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 ===== |