diff tests/test-rebase-collapse.out @ 6906:808f03f61ebe

Add rebase extension

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-rebase-collapse.out	Mon Aug 18 21:16:31 2008 +0200
@@ -0,0 +1,104 @@
+@  7: H
+|
+| o  6: G
+|/|
+o |  5: F
+| |
+| o  4: E
+|/
+| o  3: D
+| |
+| o  2: C
+| |
+| o  1: B
+|/
+o  0: A
+
+% Rebasing
+3 files updated, 0 files merged, 2 files removed, 0 files unresolved
+saving bundle to 
+adding branch
+adding changesets
+adding manifests
+adding file changes
+added 5 changesets with 6 changes to 6 files (+1 heads)
+rebase completed
+@  5: Collapsed revision
+|  * B
+|  * C
+|  * D
+o  4: H
+|
+| o  3: G
+|/|
+o |  2: F
+| |
+| o  1: E
+|/
+o  0: A
+
+% Rebasing
+saving bundle to 
+adding branch
+adding changesets
+adding manifests
+adding file changes
+added 3 changesets with 3 changes to 3 files (+1 heads)
+rebase completed
+@  6: Collapsed revision
+|  * E
+|  * G
+o  5: H
+|
+o  4: F
+|
+| o  3: D
+| |
+| o  2: C
+| |
+| o  1: B
+|/
+o  0: A
+
+@  7: H
+|
+| o    6: G
+| |\
+| | o  5: F
+| | |
+| | o  4: E
+| | |
+| o |  3: D
+| |\|
+| o |  2: C
+|/ /
+| o  1: B
+|/
+o  0: A
+
+
+% Rebase and collapse - more than one external (fail)
+abort: unable to collapse, there is more than one external parent
+
+% Rebase and collapse
+saving bundle to 
+adding branch
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 3 changes to 3 files
+rebase completed
+@    5: Collapsed revision
+|\   * E
+| |  * F
+| |  * G
+| o  4: H
+| |
+o |    3: D
+|\ \
+| o |  2: C
+| |/
+o /  1: B
+|/
+o  0: A
+