Mercurial: comparison tests/test-merge-types.t

equal deleted inserted replaced

-:de8181c5414d
+:38941a28406a
 $ hg merge --debug
 resolving manifests
 branchmerge: True, force: False, partial: False
 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
 preserving a for resolve of a
-a: versions differ -> m (premerge)
+a: versions differ -> m
 tool internal:merge (for pattern a) can't handle symlinks
 couldn't find merge tool hgmerge
 no tool found to merge a
 picked tool ':prompt' for a (binary False symlink True changedelete False)
 file 'a' needs to be resolved.
 $ hg merge --debug --tool :union
 resolving manifests
 branchmerge: True, force: False, partial: False
 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
 preserving a for resolve of a
-a: versions differ -> m (premerge)
+a: versions differ -> m
 picked tool ':union' for a (binary False symlink True changedelete False)
 merging a
 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
 warning: internal :union cannot merge symlinks for a
 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
 $ hg merge --debug --tool :merge3
 resolving manifests
 branchmerge: True, force: False, partial: False
 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
 preserving a for resolve of a
-a: versions differ -> m (premerge)
+a: versions differ -> m
 picked tool ':merge3' for a (binary False symlink True changedelete False)
 merging a
 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
 warning: internal :merge3 cannot merge symlinks for a
 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
 $ hg merge --debug --tool :merge-local
 resolving manifests
 branchmerge: True, force: False, partial: False
 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
 preserving a for resolve of a
-a: versions differ -> m (premerge)
+a: versions differ -> m
 picked tool ':merge-local' for a (binary False symlink True changedelete False)
 merging a
 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
 warning: internal :merge-local cannot merge symlinks for a
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 $ hg merge --debug --tool :merge-other
 resolving manifests
 branchmerge: True, force: False, partial: False
 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
 preserving a for resolve of a
-a: versions differ -> m (premerge)
+a: versions differ -> m
 picked tool ':merge-other' for a (binary False symlink True changedelete False)
 merging a
 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
 warning: internal :merge-other cannot merge symlinks for a
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 $ HGMERGE= hg up -y --debug --config ui.merge=
 resolving manifests
 branchmerge: False, force: False, partial: False
 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
 preserving a for resolve of a
-a: versions differ -> m (premerge)
+a: versions differ -> m
 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
 no tool found to merge a
 picked tool ':prompt' for a (binary False symlink True changedelete False)
 file 'a' needs to be resolved.
 You can keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved.
 $ ln -s 2 h
 $ hg ci -Aqm2
 $ hg merge
 merging a
+warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
 warning: cannot merge flags for b without common ancestor - keeping local flags
 merging b
+warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
 merging bx
+warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
 warning: cannot merge flags for c without common ancestor - keeping local flags
 tool internal:merge (for pattern d) can't handle symlinks
 no tool found to merge d
 file 'd' needs to be resolved.
 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
 tool internal:merge (for pattern h) can't handle symlinks
 no tool found to merge h
 file 'h' needs to be resolved.
 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
 What do you want to do? u
-warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
-warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
-warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
 3 files updated, 0 files merged, 0 files removed, 6 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
 [1]
 $ hg resolve -l
 U a
 h -> 2
 $ hg up -Cqr1
 $ hg merge
 merging a
+warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
 warning: cannot merge flags for b without common ancestor - keeping local flags
 merging b
+warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
 merging bx
+warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
 warning: cannot merge flags for c without common ancestor - keeping local flags
 tool internal:merge (for pattern d) can't handle symlinks
 no tool found to merge d
 file 'd' needs to be resolved.
 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
 tool internal:merge (for pattern h) can't handle symlinks
 no tool found to merge h
 file 'h' needs to be resolved.
 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
 What do you want to do? u
-warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
-warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
-warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
 3 files updated, 0 files merged, 0 files removed, 6 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
 [1]
 $ tellmeabout a
 a is a plain file with content:

changeset 48427	38941a28406a
parent 48345	d5a91701f7dc