Mercurial > hg-stable

diff tests/test-issue672.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-issue672.t	Sun Oct 11 20:12:12 2015 -0700
+++ b/tests/test-issue672.t	Sun Oct 11 21:56:39 2015 -0700
@@ -65,7 +65,7 @@
    branchmerge: True, force: False, partial: False
    ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
    preserving 1a for resolve of 1a
-   1a: local copied/moved from 1 -> m
+   1a: local copied/moved from 1 -> m (premerge)
   picked tool ':merge' for 1a (binary False symlink False)
   merging 1a and 1 to 1a
   my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
@@ -88,7 +88,7 @@
    ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
    preserving 1 for resolve of 1a
   removing 1
-   1a: remote moved from 1 -> m
+   1a: remote moved from 1 -> m (premerge)
   picked tool ':merge' for 1a (binary False symlink False)
   merging 1 and 1a to 1a
   my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d