Mercurial > hg-stable

comparison tests/test-copy-move-merge.t @ 44272:17e12938f8e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: print debug information about copies per side/branch Differential Revision: https://phab.mercurial-scm.org/D7987
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Jan 2020 10:39:55 -0800
parents 4764e8436b2a
children 9659ec161644
comparison
equal deleted inserted replaced
44271:6ca9f45b32b0 44272:17e12938f8e7
25 $ hg merge --debug 25 $ hg merge --debug
26 unmatched files in other: 26 unmatched files in other:
27 b 27 b
28 c 28 c
29 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 29 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
30 src: 'a' -> dst: 'b' * 30 on remote side:
31 src: 'a' -> dst: 'c' * 31 src: 'a' -> dst: 'b' *
32 src: 'a' -> dst: 'c' *
32 checking for directory renames 33 checking for directory renames
33 resolving manifests 34 resolving manifests
34 branchmerge: True, force: False, partial: False 35 branchmerge: True, force: False, partial: False
35 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 36 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
36 preserving a for resolve of b 37 preserving a for resolve of b