Mercurial > hg

comparison tests/test-merge-commit.t @ 27161:296d55def9c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add debug output for whether this is a change/delete conflict Just like binary and symlink conflicts, change/delete conflicts influence the tool picked.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 25 Nov 2015 14:25:26 -0800
parents 8e6d5b7317e6
children 564a354f7f35
comparison
equal deleted inserted replaced
27160:c533435cbc37 27161:296d55def9c4
71 resolving manifests 71 resolving manifests
72 branchmerge: True, force: False, partial: False 72 branchmerge: True, force: False, partial: False
73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
74 preserving bar for resolve of bar 74 preserving bar for resolve of bar
75 bar: versions differ -> m (premerge) 75 bar: versions differ -> m (premerge)
76 picked tool ':merge' for bar (binary False symlink False) 76 picked tool ':merge' for bar (binary False symlink False changedelete False)
77 merging bar 77 merging bar
78 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 78 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
79 premerge successful 79 premerge successful
80 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 80 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
81 (branch merge, don't forget to commit) 81 (branch merge, don't forget to commit)
157 resolving manifests 157 resolving manifests
158 branchmerge: True, force: False, partial: False 158 branchmerge: True, force: False, partial: False
159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
160 preserving bar for resolve of bar 160 preserving bar for resolve of bar
161 bar: versions differ -> m (premerge) 161 bar: versions differ -> m (premerge)
162 picked tool ':merge' for bar (binary False symlink False) 162 picked tool ':merge' for bar (binary False symlink False changedelete False)
163 merging bar 163 merging bar
164 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 164 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
165 premerge successful 165 premerge successful
166 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 166 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
167 (branch merge, don't forget to commit) 167 (branch merge, don't forget to commit)