Mercurial > hg > mercurial-crew-with-dirclash
view doc/README @ 407:0e0d0670b2bc
[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 |
line wrap: on
line source
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