Mercurial > public > mercurial-scm > hg

diff tests/test-double-merge.t @ 26618:8e6d5b7317e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d8463a743d7d
children 296d55def9c4
line wrap: on
line diff
--- a/tests/test-double-merge.t	Sun Oct 11 20:12:12 2015 -0700
+++ b/tests/test-double-merge.t	Sun Oct 11 21:56:39 2015 -0700
@@ -37,12 +37,12 @@
    ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
    preserving foo for resolve of bar
    preserving foo for resolve of foo
-   bar: remote copied from foo -> m
+   bar: remote copied from foo -> m (premerge)
   picked tool ':merge' for bar (binary False symlink False)
   merging foo and bar to bar
   my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
    premerge successful
-   foo: versions differ -> m
+   foo: versions differ -> m (premerge)
   picked tool ':merge' for foo (binary False symlink False)
   merging foo
   my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc