Mercurial > hg > mercurial-crew-with-dirclash
view doc/README @ 408:3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Merging files that are deleted in both branches
From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk>
OK, attached is an improved version of this patch...
When I went back through it, I discovered that the prior version was wrong
when doing real merges (as opposed to jumping between revisions that have
a simple linear relationship). So that's been addressed here, too.
> Here's an hg changeset patch that deals with simultaneous deletion of a
file
> in both the working directory and in a merged branch.
>
> Test case included in the patch.
manifest hash: c8078733c252403314d8046efa6ecefc49c83050
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNF8ywK+sNU5EO8RArtdAJ9syw/JXRZzP1sxnEYXzZywkJLAPACeKpqL
5osA3AggrCbbSLTNcYVXJ8U=
=T5Ik
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 18:48:28 -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