Mercurial

From W3C Tools Support Wiki
Revision as of 13:13, 25 May 2011 by Danbri (Talk | contribs)

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search

Mercurial at W3C

Notes for configuring various software to work with W3C's Mercurial instance. Push access is restricted per repository and set to Group[s] as identified by maintainer.

See also Anne's howto

  • MacHg is a free open source OSX GUI - note that empty folders won't show up and hence hard to add to repo; adding any empty doc is a workaround.
  • Hg Init: a Mercurial tutorial - "Mercurial is a modern, open source, distributed version control system, and a compelling upgrade from older systems like Subversion. In this user-friendly, six-part tutorial, Joel Spolsky teaches you the key concepts."

Folklore and other useful info

From EricP:

"In case someone later recalls this thread to see how to assure mercurial that conflicts are resolved, the somewhat opaque command is "hg resolve --mark". (This should really show up in the "can't commit with unresolved conflicts" error message. Mercurial's feature of remembering conflicts is probably useful, but has inspired some serious tearing out of hair in the past."