diff tests/test-rebase-parameters.t @ 15267:3bfdfefea2fc

rebase: use revset as soon as possible in internal logic The buildstate function now take a set of revs. Logic related to --source and --base option have been moved in the main rebase function. In the process this fixes a bug where the wrong source changeset might be pick. This explain the changes in hgext/rebase.py
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sat, 15 Oct 2011 19:07:51 +0200
parents 81f76098211e
children 6cb6064f1d50
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t	Sat Oct 15 10:20:08 2011 -0500
+++ b/tests/test-rebase-parameters.t	Sat Oct 15 19:07:51 2011 +0200
@@ -51,8 +51,8 @@
   $ cd a1
 
   $ hg rebase -s 8 -d 7
-  abort: source is a child of destination
-  [255]
+  nothing to rebase
+  [1]
 
   $ hg rebase --continue --abort
   abort: cannot use both abort and continue
@@ -76,7 +76,7 @@
 
   $ hg up -q 7
 
-  $ hg rebase
+  $ hg rebase --traceback
   nothing to rebase
   [1]