--- a/tests/test-evolution.t	Mon Sep 19 03:18:08 2011 +0200
+++ b/tests/test-evolution.t	Mon Sep 19 18:03:51 2011 +0200
@@ -113,7 +113,7 @@
 To begin with, we just do the changes that will be the initial version of the changeset::
 
   $ echo One >file-from-A
-  $ sed -i '' -e s/One/Eins/ main-file-1 
+  $ sed -i'' -e s/One/Eins/ main-file-1
   $ hg add file-from-A
 
 So this is what we would like our changeset to be::
@@ -147,7 +147,7 @@
 Let's do this again for the second changeset::
 
   $ echo Two >file-from-B
-  $ sed -i '' -e s/Two/Zwie/ main-file-1
+  $ sed -i'' -e s/Two/Zwie/ main-file-1
   $ hg add file-from-B
 
 Before committing, however, we need to switch to a new bookmark for the second
@@ -174,7 +174,7 @@
 
 Fixing this is very easy. Just change::
 
-  $ sed -i '' -e s/Zwie/Zwei/ main-file-1
+  $ sed -i'' -e s/Zwie/Zwei/ main-file-1
 
 and **amend**::
 
@@ -193,7 +193,7 @@
   0	: base - test
 
   $ hg up feature-A -q
-  $ sed -i '' -e s/Eins/Un/ main-file-1
+  $ sed -i'' -e s/Eins/Un/ main-file-1
 
   $ hg amend --note 'french looks better'
   $ hg log
@@ -202,11 +202,10 @@
   1	: a nifty feature - test
   0	: base - test
   $ hg evolve
-  hg rebase --dest 6 --source 4 --detach
+  hg relocate --rev 4 6
   $ hg up feature-B -q #prevent feature-A bookmark to move grml
-  $ hg rebase --dest 6 --source 4 --detach
+  $ hg relocate -r 4 6 --traceback
   merging main-file-1
-  $ hg bookmark -fr 7 feature-B # XXX there is a bug out-there because we force --keep imp
   $ hg log
   7	feature-B: another feature - test
   6	feature-A: a nifty feature - test