--- a/tests/test-filebranch Thu Mar 20 14:14:15 2008 -0500
+++ b/tests/test-filebranch Thu Mar 20 15:59:54 2008 -0500
@@ -37,7 +37,7 @@
hg commit -m "branch b" -d "1000000 0"
echo "we shouldn't have anything but n state here"
-hg debugstate --nodates
+hg debugstate --nodates | grep -v "^n"
echo merging
hg pull ../a
--- a/tests/test-filebranch.out Thu Mar 20 14:14:15 2008 -0500
+++ b/tests/test-filebranch.out Thu Mar 20 15:59:54 2008 -0500
@@ -3,10 +3,6 @@
creating branch a
creating branch b
we shouldn't have anything but n state here
-n 0 -1 bar
-n 0 -1 baz
-n 0 -1 foo
-n 0 -1 quux
merging
pulling from ../a
searching for changes