diff -r 8bea39ca9acb -r 3bfdfefea2fc tests/test-rebase-collapse.t --- a/tests/test-rebase-collapse.t Sat Oct 15 10:20:08 2011 -0500 +++ b/tests/test-rebase-collapse.t Sat Oct 15 19:07:51 2011 +0200 @@ -74,12 +74,12 @@ $ cd .. -Rebasing G onto H: +Rebasing E onto H: $ hg clone -q -u . a a2 $ cd a2 - $ hg rebase --base 6 --collapse + $ hg rebase --source 4 --collapse saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @@ -115,7 +115,7 @@ abort: message can only be specified with collapse [255] - $ hg rebase --base 6 --collapse -m 'custom message' + $ hg rebase --source 4 --collapse -m 'custom message' saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) $ hg tglog