Mercurial > hg-stable

diff tests/test-rebase-parameters.t @ 15270:6cb6064f1d50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add --rev option to rebase This option allow a strict set of revision to be specified instead of using -s or -b. Rebase will refuse start if striping rebased changeset will strip non rebased changeset. Rebase will refuse to work on set with multiple root.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sat, 15 Oct 2011 20:12:32 +0200
parents 3bfdfefea2fc
children 65df60a3f96b
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t	Sat Oct 15 12:57:47 2011 -0500
+++ b/tests/test-rebase-parameters.t	Sat Oct 15 20:12:32 2011 +0200
@@ -67,7 +67,7 @@
   [255]
 
   $ hg rebase --base 5 --source 4
-  abort: cannot specify both a revision and a base
+  abort: cannot specify both a source and a base
   [255]
 
   $ hg rebase