##// END OF EJS Templates
tests: fix repeatability for test-filebranch with dirstate granularity
Matt Mackall -
r6329:3f754be7 default
parent child Browse files
Show More
@@ -37,7 +37,7 b' echo 2b > baz'
37 37 hg commit -m "branch b" -d "1000000 0"
38 38
39 39 echo "we shouldn't have anything but n state here"
40 hg debugstate --nodates
40 hg debugstate --nodates | grep -v "^n"
41 41
42 42 echo merging
43 43 hg pull ../a
@@ -3,10 +3,6 b' 4 files updated, 0 files merged, 0 files'
3 3 creating branch a
4 4 creating branch b
5 5 we shouldn't have anything but n state here
6 n 0 -1 bar
7 n 0 -1 baz
8 n 0 -1 foo
9 n 0 -1 quux
10 6 merging
11 7 pulling from ../a
12 8 searching for changes
General Comments 0
You need to be logged in to leave comments. Login now