--- a/tests/test-tutorial.t Fri Aug 24 11:49:21 2012 +0200
+++ b/tests/test-tutorial.t Thu Sep 20 23:14:59 2012 +0200
@@ -59,10 +59,13 @@
$ hg showconfig extensions
extensions.hgext.graphlog=
-And of course, we anabled the experimental extensions for mutable history:
+And of course, we enable the experimental extensions for mutable history:
- $ $(dirname $TESTDIR)/enable.sh >> $HGRCPATH 2> /dev/null
-
+ $ cat >> $HGRCPATH <<EOF
+ > [extensions]
+ > rebase =
+ > evolve = $TESTDIR/../hgext/evolve.py
+ > EOF
-----------------------
Single Developer Usage
@@ -400,7 +403,7 @@
for simplicity shake we get the bathroom change in line again
- $ hg rebase -Dr 8d39a843582d -d a2fccc2e7b08
+ $ hg rebase -r 8d39a843582d -d a2fccc2e7b08
merging shopping
$ hg phase --draft .
$ hg log -G
@@ -624,11 +627,11 @@
$ hg evolve --dry-run
move:[15] animals
atop:[14] bathroom stuff
- hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818
+ hg rebase -r 9ac5d0e790a2 -d ffa278c50818
Let's do it
- $ hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818
+ $ hg rebase -r 9ac5d0e790a2 -d ffa278c50818
merging shopping
The old version of bathroom is hidden again.