diff -r 16a13fdb4b36 -r 129e96f7a87a tests/test-rebase-collapse --- a/tests/test-rebase-collapse Tue Mar 23 20:01:30 2010 +0100 +++ b/tests/test-rebase-collapse Tue Mar 23 20:45:08 2010 +0100 @@ -43,7 +43,7 @@ hg glog --template '{rev}: {desc}\n' echo '% Rebasing B onto H' hg up -C 3 -hg rebase --collapse 2>&1 | sed 's/\(saving bundle to \).*/\1/' +hg rebase --collapse --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/' hg glog --template '{rev}: {desc}\n' echo "Expected A, B, C, D, F, H" hg manifest