# HG changeset patch # User Matt Mackall # Date 2008-03-20 20:59:54 # Node ID 3f754be7abbb8b732cacc2a8213d53a34ae22676 # Parent 991f7518c3f37a674bf2c4904d6572fc4d045692 tests: fix repeatability for test-filebranch with dirstate granularity diff --git a/tests/test-filebranch b/tests/test-filebranch --- a/tests/test-filebranch +++ b/tests/test-filebranch @@ -37,7 +37,7 @@ echo 2b > baz 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 diff --git a/tests/test-filebranch.out b/tests/test-filebranch.out --- a/tests/test-filebranch.out +++ b/tests/test-filebranch.out @@ -3,10 +3,6 @@ 4 files updated, 0 files merged, 0 files 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