Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-double-merge.out @ 5371:17ed9b9a0d03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add debug diagnostics for findcopies
author Matt Mackall <mpm@selenic.com>
date Thu, 04 Oct 2007 19:44:37 -0500
parents f191bc3916f7
children
comparison
equal deleted inserted replaced
5370:61462e7d62ed 5371:17ed9b9a0d03
1 resolving manifests 1 resolving manifests
2 overwrite None partial False 2 overwrite None partial False
3 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 3 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
4 searching for copies back to rev 1
5 unmatched files in other:
6 bar
7 all copies found (* = to merge, ! = divergent):
8 bar -> foo *
9 checking for directory renames
4 foo: versions differ -> m 10 foo: versions differ -> m
5 foo: remote copied to bar -> m 11 foo: remote copied to bar -> m
6 copying foo to bar 12 copying foo to bar
7 merging foo and bar 13 merging foo and bar
8 my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da 14 my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da