Mercurial > public > mercurial-scm > hg
diff tests/test-merge-types.t @ 26618:8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
We perform all that we can non-interactively before prompting the user for input
via their merge tool. This allows for a maximally consistent state when the user
is first prompted.
The test output changes indicate the actual behavior change happening.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 21:56:39 -0700 |
| parents | ef1eb6df7071 |
| children | 4b966aaadc45 |
line wrap: on
line diff
--- a/tests/test-merge-types.t Sun Oct 11 20:12:12 2015 -0700 +++ b/tests/test-merge-types.t Sun Oct 11 21:56:39 2015 -0700 @@ -35,7 +35,7 @@ branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c preserving a for resolve of a - a: versions differ -> m + a: versions differ -> m (premerge) picked tool ':merge' for a (binary False symlink True) merging a my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da @@ -68,7 +68,7 @@ branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f preserving a for resolve of a - a: versions differ -> m + a: versions differ -> m (premerge) picked tool ':union' for a (binary False symlink True) merging a my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da @@ -91,7 +91,7 @@ branchmerge: True, force: False, partial: False ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f preserving a for resolve of a - a: versions differ -> m + a: versions differ -> m (premerge) picked tool ':merge3' for a (binary False symlink True) merging a my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da @@ -124,7 +124,7 @@ branchmerge: False, force: False, partial: False ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f preserving a for resolve of a - a: versions differ -> m + a: versions differ -> m (premerge) (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) picked tool ':prompt' for a (binary False symlink True) no tool found to merge a @@ -283,10 +283,8 @@ $ hg merge merging a - warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: cannot merge flags for b merging b - warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: cannot merge flags for c merging d warning: internal :merge cannot merge symlinks for d @@ -297,6 +295,8 @@ merging h warning: internal :merge cannot merge symlinks for h warning: conflicts while merging h! (edit, then use 'hg resolve --mark') + warning: conflicts while merging a! (edit, then use 'hg resolve --mark') + warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 3 files updated, 0 files merged, 0 files removed, 5 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] @@ -342,10 +342,8 @@ $ hg up -Cqr1 $ hg merge merging a - warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: cannot merge flags for b merging b - warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: cannot merge flags for c merging d warning: internal :merge cannot merge symlinks for d @@ -356,6 +354,8 @@ merging h warning: internal :merge cannot merge symlinks for h warning: conflicts while merging h! (edit, then use 'hg resolve --mark') + warning: conflicts while merging a! (edit, then use 'hg resolve --mark') + warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 3 files updated, 0 files merged, 0 files removed, 5 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1]