--- a/tests/test-evolution.t Mon Sep 19 01:57:43 2011 +0200
+++ b/tests/test-evolution.t Mon Sep 19 03:18:08 2011 +0200
@@ -8,6 +8,7 @@
> git = 1
> unified = 0
> [extensions]
+ > hgext.rebase=
> EOF
$ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH
$ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
@@ -190,3 +191,23 @@
4 feature-B: another feature - test
1 feature-A: a nifty feature - test
0 : base - test
+
+ $ hg up feature-A -q
+ $ sed -i '' -e s/Eins/Un/ main-file-1
+
+ $ hg amend --note 'french looks better'
+ $ hg log
+ 6 feature-A: a nifty feature - test
+ 4 feature-B: another feature - test
+ 1 : a nifty feature - test
+ 0 : base - test
+ $ hg evolve
+ hg rebase --dest 6 --source 4 --detach
+ $ hg up feature-B -q #prevent feature-A bookmark to move grml
+ $ hg rebase --dest 6 --source 4 --detach
+ 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
+ 0 : base - test