Mercurial > hg > mercurial-crew-with-dirclash

annotate doc/README @ 407:0e0d0670b2bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 18:41:57 -0800
parents 089594a5bbde
children 7a3a3952c431
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
1 Files in this directory:
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
2
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
3 README - this file
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
4 hg.1.txt - asciidoc source for the files
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
5 hg.1 - groff man page for hg
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
6 hg.1.html - man page in html format
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
7
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
8 How to generate the man page and html files
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
9
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
10 For now we use asciidoc which is available at:
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
11
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
12 http://www.methods.co.nz/asciidoc/
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
13
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
14 the file hg.1.txt is the input file, to generate the man page:
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
15
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
16 asciidoc.py -d manpage -b docbook hg.1.txt
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
17 xmlto man hg.1.xml
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
18
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
19 to display:
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
20
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
21 groff -mandoc -Tascii hg.1 | more
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
22
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
23 to create the html page (without stylesheets):
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
24
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset
25 asciidoc.py -b html hg.1.txt