Mercurial > public > mercurial-scm > hg-stable

diff tests/test-issue522.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 e2dc5397bc82
children bd625cd4e5e7
line wrap: on
line diff
--- a/tests/test-issue522.t	Fri Oct 10 13:05:50 2014 -0500
+++ b/tests/test-issue522.t	Fri Oct 10 13:31:06 2014 -0500
@@ -38,7 +38,7 @@
   (branch merge, don't forget to commit)
 
   $ hg debugstate | grep foo
-  n   0         -2 unset               foo
+  m   0         -2 unset               foo
 
   $ hg st -A foo
   M foo