Mercurial > hg

diff tests/test-filebranch.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 b87acfda5268
children 2428e8ec0793
line wrap: on
line diff
--- a/tests/test-filebranch.t	Fri Oct 10 13:05:50 2014 -0500
+++ b/tests/test-filebranch.t	Fri Oct 10 13:31:06 2014 -0500
@@ -66,11 +66,6 @@
   $ echo 2b > baz
   $ echo new > quux
 
-We shouldn't have anything but foo in merge state here:
-
-  $ hg debugstate --nodates | grep "^m"
-  m 644          3 foo
-
   $ hg ci -m "merge"
 
 main: we should have a merge here: