Mercurial > hg-stable

comparison tests/test-update-reverse.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 28e2e3804f2e
children 760c0d67ce5e
comparison
equal deleted inserted replaced
15624:be43234a6d60 15625:efdcce3fd2d5
64 side1 64 side1
65 side2 65 side2
66 66
67 $ hg update --debug -C 1 67 $ hg update --debug -C 1
68 resolving manifests 68 resolving manifests
69 overwrite True partial False 69 overwrite: True, partial: False
70 ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf 70 ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
71 side2: other deleted -> r 71 side2: other deleted -> r
72 side1: other deleted -> r 72 side1: other deleted -> r
73 main: remote created -> g 73 main: remote created -> g
74 updating: side1 1/3 files (33.33%) 74 updating: side1 1/3 files (33.33%)
75 removing side1 75 removing side1