--- a/tests/test-rebase-scenario-global Thu Oct 08 10:07:41 2009 +0200
+++ b/tests/test-rebase-scenario-global Thu Oct 08 10:39:43 2009 +0200
@@ -70,7 +70,7 @@
hg rebase -s 3 -d 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
hg glog --template '{rev}: {desc}\n'
-echo '% These will fail'
+echo '% These will fail (using --source)'
createrepo > /dev/null 2>&1
echo '% E onto D - rebase onto an ancestor'
hg rebase -s 4 -d 3
@@ -79,4 +79,13 @@
echo '% E onto B - merge revision with both parents not in ancestors of target'
hg rebase -s 4 -d 1
+echo
+echo '% These will abort gracefully (using --base)'
+echo '% E onto E - rebase onto same changeset'
+hg rebase -b 4 -d 4
+echo '% E onto D - rebase onto an ancestor'
+hg rebase -b 4 -d 3
+echo '% D onto E - rebase onto a descendant'
+hg rebase -b 3 -d 4
+
exit 0