unify checkout and resolve into update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 unify checkout and resolve into update This replaces checkout and resolve with a single command: $ hg help co hg update [node] update or merge working directory If there are no outstanding changes in the working directory and there is a linear relationship between the current version and the requested version, the result is the requested version. Otherwise the result is a merge between the contents of the current working directory and the requested version. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates are allowed. manifest hash: 513d285d7fb775d0560de49387042a685ea062f7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFComS7ywK+sNU5EO8RAmgRAJ96GA6qvHLy0Jp0fzUrR2os2azPuACePsdC YBldZtA7yIuTnV2vIbn7OSE= =QtM/ -----END PGP SIGNATURE-----

Files in this directory:

README - this file
hg.1.txt - asciidoc source for the files
hg.1 - groff man page for hg
hg.1.html - man page in html format

How to generate the man page and html files

For now we use asciidoc which is available at:

http://www.methods.co.nz/asciidoc/

the file hg.1.txt is the input file, to generate the man page:

asciidoc.py -d manpage -b docbook hg.1.txt
xmlto man hg.1.xml

to display:

groff -mandoc -Tascii hg.1 | more

to create the html page (without stylesheets):

asciidoc.py -b html hg.1.txt