Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-copy-move-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 8d9bdcbb2b18
children
comparison
equal deleted inserted replaced
5370:61462e7d62ed 5371:17ed9b9a0d03
1 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
2 resolving manifests 2 resolving manifests
3 overwrite None partial False 3 overwrite None partial False
4 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0 4 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
5 searching for copies back to rev 1
6 unmatched files in other:
7 b
8 c
9 all copies found (* = to merge, ! = divergent):
10 c -> a *
11 b -> a *
12 checking for directory renames
5 a: remote moved to c -> m 13 a: remote moved to c -> m
6 a: remote moved to b -> m 14 a: remote moved to b -> m
7 copying a to b 15 copying a to b
8 copying a to c 16 copying a to c
9 merging a and b 17 merging a and b