Mercurial > hg

comparison tests/test-issue672.t @ 20945:18adc15635a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: keep destination filename as key in filemerge actions Gives more readable debug output and makes it possible to compare/merge actions later.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 02 Mar 2014 18:52:16 +0100
parents 5cc71484ee9c
children 0d67fccc0d43
comparison
equal deleted inserted replaced
20944:5b8d5803d7b7 20945:18adc15635a1
63 src: '1' -> dst: '1a' * 63 src: '1' -> dst: '1a' *
64 checking for directory renames 64 checking for directory renames
65 resolving manifests 65 resolving manifests
66 branchmerge: True, force: False, partial: False 66 branchmerge: True, force: 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 from 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
73 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d 73 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
86 src: '1' -> dst: '1a' * 86 src: '1' -> dst: '1a' *
87 checking for directory renames 87 checking for directory renames
88 resolving manifests 88 resolving manifests
89 branchmerge: True, force: False, partial: False 89 branchmerge: True, force: 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 1a: remote moved from 1 -> 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: 1a 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)
96 merging 1 and 1a to 1a 96 merging 1 and 1a to 1a
97 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d 97 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
98 premerge successful 98 premerge successful
99 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 99 0 files updated, 1 files merged, 0 files removed, 0 files unresolved