Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge1.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
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
3 merge 3 merge
4 resolving manifests 4 resolving manifests
5 overwrite None partial False 5 overwrite None partial False
6 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 6 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
7 searching for copies back to rev 1
8 unmatched files in local:
9 c2
10 unmatched files in other:
11 b
12 b2
13 all copies found (* = to merge, ! = divergent):
14 c2 -> a2
15 b -> a *
16 b2 -> a2
17 checking for directory renames
7 a2: divergent renames -> dr 18 a2: divergent renames -> dr
8 a: remote moved to b -> m 19 a: remote moved to b -> m
9 b2: remote created -> g 20 b2: remote created -> g
10 copying a to b 21 copying a to b
11 merging a and b 22 merging a and b