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/12/11 21:32] – [Setting Up Mercurial Preferences] rossen | tools:hg [2015/01/07 10:54] – [Synchronizing Changes] auth failed -> email Peter tantek | ||
---|---|---|---|
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 | + | Mercurial Distributed SCM (version |
(see http:// | (see http:// | ||
</ | </ | ||
Line 58: | Line 58: | ||
| | ||
[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 |
- | w3c.prefix = https:// | + | 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.username = your_w3.org_username | w3c.username = your_w3.org_username | ||
w3c.password = your_w3.org_password #optional | w3c.password = your_w3.org_password #optional | ||
Line 89: | Line 99: | ||
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 = 97:4c:0e:c5:2e:95:74:5e:c7:fa:ed:07:3f:97:ab:ea:80:7a:be:7c | + | 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 = b8:28:ac:7c:3e:7e:d5:cc:1f:af:8a:fd:6d:9b:93:2d:9f:d7:a4:59 | + | hg.csswg.org = 71: |
- | + | hg.fxtf.org = B9:28:66:37:CB:36:3E:0B:A6:05:32:2F:7A:34:76:54:29:37:2A:9D | |
- | Note that these fingerprints will only be valid until the certificates expire (dvcs.w3.org expires 03-may-2014, hg.csswg.org expires expires | + | |
+ | |||
+ | 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 134: | Line 146: | ||
</ | </ | ||
- | ** 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 166: | ||
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 173: | ||
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 313: | Line 327: | ||
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 511: | Line 529: | ||
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 |