branch | stable |
changeset 10762 | 129e96f7a87a |
parent 9815 | 49efeed49c94 |
child 11198 | b345b1cc124f |
--- 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