Mercurial > hg
diff tests/test-up-local-change.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 | a5ff66e6d77a |
children | 296d55def9c4 |
line wrap: on
line diff
--- a/tests/test-up-local-change.t Sun Oct 11 20:12:12 2015 -0700 +++ b/tests/test-up-local-change.t Sun Oct 11 21:56:39 2015 -0700 @@ -49,10 +49,11 @@ preserving a for resolve of a b: remote created -> g getting b - a: versions differ -> m + a: versions differ -> m (premerge) picked tool 'true' for a (binary False symlink False) merging a my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a + a: versions differ -> m (merge) picked tool 'true' for a (binary False symlink False) my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a launching merge tool: true *$TESTTMP/r2/a* * * (glob) @@ -72,10 +73,11 @@ preserving a for resolve of a b: other deleted -> r removing b - a: versions differ -> m + a: versions differ -> m (premerge) picked tool 'true' for a (binary False symlink False) merging a my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb + a: versions differ -> m (merge) picked tool 'true' for a (binary False symlink False) my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb launching merge tool: true *$TESTTMP/r2/a* * * (glob) @@ -103,10 +105,11 @@ preserving a for resolve of a b: remote created -> g getting b - a: versions differ -> m + a: versions differ -> m (premerge) picked tool 'true' for a (binary False symlink False) merging a my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a + a: versions differ -> m (merge) picked tool 'true' for a (binary False symlink False) my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a launching merge tool: true *$TESTTMP/r2/a* * * (glob)