Mercurial > hg

diff tests/test-merge-remove.t @ 22896:7e9cbb9c6053

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: use 'm' state in otherparent to reduce ambiguity In rebase-like operations where we abandon the second parent, we can correctly fix up the state in setparents.
author Matt Mackall <mpm@selenic.com>
date Fri, 10 Oct 2014 13:31:06 -0500
parents e4d7cbc94219
children 8fe74328f700
line wrap: on
line diff
--- a/tests/test-merge-remove.t	Fri Oct 10 13:05:50 2014 -0500
+++ b/tests/test-merge-remove.t	Fri Oct 10 13:31:06 2014 -0500
@@ -21,7 +21,7 @@
   (branch merge, don't forget to commit)
 
   $ hg debugstate --nodates
-  n   0         -2 bar
+  m   0         -2 bar
   m 644         14 foo1
   copy: foo -> foo1
 
@@ -37,7 +37,7 @@
   $ hg rm -f foo1 bar
 
   $ hg debugstate --nodates
-  r   0         -2 bar
+  r   0         -1 bar
   r   0         -1 foo1
   copy: foo -> foo1
 
@@ -55,7 +55,7 @@
   adding foo1
 
   $ hg debugstate --nodates
-  n   0         -2 bar
+  m 644          5 bar
   m 644         14 foo1
   copy: foo -> foo1
 
@@ -74,7 +74,7 @@
   reverting foo1
 
   $ hg debugstate --nodates
-  n   0         -2 bar
+  m 644          5 bar
   m 644         14 foo1
   copy: foo -> foo1