Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 02 Aug 2007 01:56:08 -0300] rev 5051
update tests output
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 15:16:42 -0700] rev 5050
convert: (svn) simplify _find_children
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 14:32:53 -0700] rev 5049
Merge with stable
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 14:32:05 -0700] rev 5048
Update asciidoc instructions to suggest html4 for newer versions
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 14:26:30 -0700] rev 5047
Merge with mpm
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 12:03:50 -0700] rev 5046
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 12:03:10 -0700] rev 5045
dirstate: improve error message on file/directory clash
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 11:37:11 -0700] rev 5044
imerge extension and test
Matt Mackall <mpm@selenic.com> [Wed, 01 Aug 2007 14:03:48 -0500] rev 5043
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 01 Aug 2007 12:33:12 -0500] rev 5042
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