--- a/tests/test-rebase-abort.out Wed Jun 09 17:22:59 2010 +0200
+++ b/tests/test-rebase-abort.out Tue Jun 08 18:01:07 2010 +0200
@@ -1,5 +1,4 @@
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-created new head
+
@ 4: L2
|
o 3: L1
@@ -30,3 +29,41 @@
|
o 0: C1
+
+% Rebase and abort without generating new changesets
+
+@ 4:C1
+|
+o 3:B bis
+|
+| o 2:C
+| |
+| o 1:B
+|/
+o 0:A
+
+warning: conflicts during merge.
+merging c failed!
+abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+merging c
+@ 4:C1
+|
+o 3:B bis
+|
+| @ 2:C
+| |
+| o 1:B
+|/
+o 0:A
+
+rebase aborted
+@ 4:C1
+|
+o 3:B bis
+|
+| o 2:C
+| |
+| o 1:B
+|/
+o 0:A
+