Mercurial > hg

comparison tests/test-issue672.t @ 15625:efdcce3fd2d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make debug output easier to read I always found it hard to figure out what the debug code meant without the separators.
author Martin Geisler <mg@aragost.com>
date Fri, 09 Dec 2011 17:34:53 +0100
parents b63f6422d2a7
children e9ae770eff1c
comparison
equal deleted inserted replaced
15624:be43234a6d60 15625:efdcce3fd2d5
30 1a 30 1a
31 all copies found (* = to merge, ! = divergent): 31 all copies found (* = to merge, ! = divergent):
32 1a -> 1 32 1a -> 1
33 checking for directory renames 33 checking for directory renames
34 resolving manifests 34 resolving manifests
35 overwrite None partial False 35 overwrite: False, partial: False
36 ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a 36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
37 1: other deleted -> r 37 1: other deleted -> r
38 1a: remote created -> g 38 1a: remote created -> g
39 updating: 1 1/2 files (50.00%) 39 updating: 1 1/2 files (50.00%)
40 removing 1 40 removing 1
41 updating: 1a 2/2 files (100.00%) 41 updating: 1a 2/2 files (100.00%)
61 1a 61 1a
62 all copies found (* = to merge, ! = divergent): 62 all copies found (* = to merge, ! = divergent):
63 1a -> 1 * 63 1a -> 1 *
64 checking for directory renames 64 checking for directory renames
65 resolving manifests 65 resolving manifests
66 overwrite None partial False 66 overwrite: False, partial: False
67 ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96 67 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
68 1a: local copied/moved to 1 -> m 68 1a: local copied/moved to 1 -> m
69 preserving 1a for resolve of 1a 69 preserving 1a for resolve of 1a
70 updating: 1a 1/1 files (100.00%) 70 updating: 1a 1/1 files (100.00%)
71 picked tool 'internal:merge' for 1a (binary False symlink False) 71 picked tool 'internal:merge' for 1a (binary False symlink False)
72 merging 1a and 1 to 1a 72 merging 1a and 1 to 1a
84 1a 84 1a
85 all copies found (* = to merge, ! = divergent): 85 all copies found (* = to merge, ! = divergent):
86 1a -> 1 * 86 1a -> 1 *
87 checking for directory renames 87 checking for directory renames
88 resolving manifests 88 resolving manifests
89 overwrite None partial False 89 overwrite: False, partial: False
90 ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8 90 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
91 1: remote moved to 1a -> m 91 1: remote moved to 1a -> m
92 preserving 1 for resolve of 1a 92 preserving 1 for resolve of 1a
93 removing 1 93 removing 1
94 updating: 1 1/1 files (100.00%) 94 updating: 1 1/1 files (100.00%)
95 picked tool 'internal:merge' for 1a (binary False symlink False) 95 picked tool 'internal:merge' for 1a (binary False symlink False)