--- a/tests/bundles/rebase.sh Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/bundles/rebase.sh Sat Apr 30 17:38:06 2011 +0200
@@ -2,21 +2,41 @@
hg init rebase
cd rebase
+# @ 7: 'H'
+# |
+# | o 6: 'G'
+# |/|
+# o | 5: 'F'
+# | |
+# | o 4: 'E'
+# |/
+# | o 3: 'D'
+# | |
+# | o 2: 'C'
+# | |
+# | o 1: 'B'
+# |/
+# o 0: 'A'
+
echo A > A
hg ci -Am A
echo B > B
hg ci -Am B
-hg up -q -C 0
echo C > C
hg ci -Am C
-hg up -q -C 0
echo D > D
hg ci -Am D
-hg merge -r 2
-hg ci -m E
-hg up -q -C 3
+hg up -q -C 0
+echo E > E
+hg ci -Am E
+hg up -q -C 0
echo F > F
hg ci -Am F
+hg merge -r 4
+hg ci -m G
+hg up -q -C 5
+echo H > H
+hg ci -Am H
hg bundle -a ../rebase.hg