Mercurial > hg

diff tests/test-merge-remove.t @ 22897:8fe74328f700

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: merge falls through to otherparent This lets us more correctly fix the state when we use setparents, as demonstrated in the change in test-graft.t.
author Matt Mackall <mpm@selenic.com>
date Sat, 11 Oct 2014 14:05:09 -0500
parents 7e9cbb9c6053
children ddc17eaf0f1b
line wrap: on
line diff
--- a/tests/test-merge-remove.t	Fri Oct 10 13:31:06 2014 -0500
+++ b/tests/test-merge-remove.t	Sat Oct 11 14:05:09 2014 -0500
@@ -22,7 +22,7 @@
 
   $ hg debugstate --nodates
   m   0         -2 bar
-  m 644         14 foo1
+  m   0         -2 foo1
   copy: foo -> foo1
 
   $ hg st -q
@@ -55,8 +55,8 @@
   adding foo1
 
   $ hg debugstate --nodates
-  m 644          5 bar
-  m 644         14 foo1
+  n   0         -2 bar
+  n   0         -2 foo1
   copy: foo -> foo1
 
   $ hg st -qC
@@ -74,8 +74,8 @@
   reverting foo1
 
   $ hg debugstate --nodates
-  m 644          5 bar
-  m 644         14 foo1
+  n   0         -2 bar
+  n   0         -2 foo1
   copy: foo -> foo1
 
   $ hg st -qC