Mercurial > hg

comparison tests/test-issue672.t @ 44197: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 99ebde4fec99
children 69429972ff1f
comparison
equal deleted inserted replaced
44196:6ca9f45b32b0 44197:17e12938f8e7
26 26
27 $ hg merge --debug 1 27 $ hg merge --debug 1
28 unmatched files in other: 28 unmatched files in other:
29 1a 29 1a
30 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 30 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
31 src: '1' -> dst: '1a' 31 on remote side:
32 src: '1' -> dst: '1a'
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: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a 36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
36 1: other deleted -> r 37 1: other deleted -> r
54 55
55 $ hg merge -y --debug 4 56 $ hg merge -y --debug 4
56 unmatched files in local: 57 unmatched files in local:
57 1a 58 1a
58 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 59 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
59 src: '1' -> dst: '1a' * 60 on local side:
61 src: '1' -> dst: '1a' *
60 checking for directory renames 62 checking for directory renames
61 resolving manifests 63 resolving manifests
62 branchmerge: True, force: False, partial: False 64 branchmerge: True, force: False, partial: False
63 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 65 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
64 preserving 1a for resolve of 1a 66 preserving 1a for resolve of 1a
76 78
77 $ hg merge -y --debug 3 79 $ hg merge -y --debug 3
78 unmatched files in other: 80 unmatched files in other:
79 1a 81 1a
80 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 82 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
81 src: '1' -> dst: '1a' * 83 on remote side:
84 src: '1' -> dst: '1a' *
82 checking for directory renames 85 checking for directory renames
83 resolving manifests 86 resolving manifests
84 branchmerge: True, force: False, partial: False 87 branchmerge: True, force: False, partial: False
85 ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b 88 ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
86 preserving 1 for resolve of 1a 89 preserving 1 for resolve of 1a