Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-issue672.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 ad6b97132b81
children
comparison
equal deleted inserted replaced
5370:61462e7d62ed 5371:17ed9b9a0d03
2 adding 2 2 adding 2
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4 resolving manifests 4 resolving manifests
5 overwrite None partial False 5 overwrite None partial False
6 ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c 6 ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c
7 searching for copies back to rev 1
8 unmatched files in other:
9 1a
10 all copies found (* = to merge, ! = divergent):
11 1a -> 1
12 checking for directory renames
7 1: other deleted -> r 13 1: other deleted -> r
8 1a: remote created -> g 14 1a: remote created -> g
9 removing 1 15 removing 1
10 getting 1a 16 getting 1a
11 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 17 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
13 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 19 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
14 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
15 resolving manifests 21 resolving manifests
16 overwrite None partial False 22 overwrite None partial False
17 ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96 23 ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96
24 searching for copies back to rev 1
25 unmatched files in local:
26 1a
27 all copies found (* = to merge, ! = divergent):
28 1a -> 1 *
29 checking for directory renames
18 1a: local moved to 1 -> m 30 1a: local moved to 1 -> m
19 merging 1a and 1 31 merging 1a and 1
20 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d 32 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 33 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
22 (branch merge, don't forget to commit) 34 (branch merge, don't forget to commit)
23 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 35 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
24 resolving manifests 36 resolving manifests
25 overwrite None partial False 37 overwrite None partial False
26 ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052 38 ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052
39 searching for copies back to rev 1
40 unmatched files in other:
41 1a
42 all copies found (* = to merge, ! = divergent):
43 1a -> 1 *
44 checking for directory renames
27 1: remote moved to 1a -> m 45 1: remote moved to 1a -> m
28 copying 1 to 1a 46 copying 1 to 1a
29 merging 1 and 1a 47 merging 1 and 1a
30 my 1@746e9549ea96+ other 1a@2f8037f47a5c ancestor 1@81f4b099af3d 48 my 1@746e9549ea96+ other 1a@2f8037f47a5c ancestor 1@81f4b099af3d
31 removing 1 49 removing 1