Mercurial > hg

comparison tests/test-rename-merge1.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 ec5886db9dc6
children ad394c897b16
comparison
equal deleted inserted replaced
15624:be43234a6d60 15625:efdcce3fd2d5
33 b -> a * 33 b -> a *
34 b2 -> a2 ! 34 b2 -> a2 !
35 checking for directory renames 35 checking for directory renames
36 a2: divergent renames -> dr 36 a2: divergent renames -> dr
37 resolving manifests 37 resolving manifests
38 overwrite None partial False 38 overwrite: False, partial: False
39 ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c 39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c
40 a: remote moved to b -> m 40 a: remote moved to b -> m
41 b2: remote created -> g 41 b2: remote created -> g
42 preserving a for resolve of b 42 preserving a for resolve of b
43 removing a 43 removing a
44 updating: a 1/3 files (33.33%) 44 updating: a 1/3 files (33.33%)