Mercurial > hg > mercurial-crew-with-dirclash
view doc/README @ 5045:f191bc3916f7
merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Aug 2007 12:33:12 -0500 |
parents | 7a3a3952c431 |
children | 8db8e1100f3f |
line wrap: on
line source
Mercurial's documentation is currently kept in ASCIIDOC format, which is a simple plain text format that's easy to read and edit. It's also convertible to a variety of other formats including standard UNIX man page format and HTML. To do this, you'll need to install ASCIIDOC: http://www.methods.co.nz/asciidoc/ To generate the man page: asciidoc -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 -b html hg.1.txt