view tests/test-rebase-detach.out @ 11848:f54ff49393fb

tests: unify test-abort-checkin
author Martin Geisler <mg@lazybytes.net>
date Sat, 14 Aug 2010 02:03:01 +0200
parents 7a9cf012dddc
children
line wrap: on
line source

@  4: E
|
| o  3: D
| |
| o  2: C
| |
| o  1: B
|/
o  0: A

% Rebasing D onto E detaching from C
saved backup bundle to 
@  4: D
|
o  3: E
|
| o  2: C
| |
| o  1: B
|/
o  0: A

Expected A, D, E
A
D
E

@  4: E
|
| o  3: D
| |
| o  2: C
| |
| o  1: B
|/
o  0: A

% Rebasing C onto E detaching from B
saved backup bundle to 
@  4: D
|
o  3: C
|
o  2: E
|
| o  1: B
|/
o  0: A

Expected A, C, D, E
A
C
D
E

@  4: E
|
| o  3: D
| |
| o  2: C
| |
| o  1: B
|/
o  0: A

% Rebasing B onto E using detach (same as not using it)
saved backup bundle to 
@  4: D
|
o  3: C
|
o  2: B
|
o  1: E
|
o  0: A

Expected A, B, C, D, E
A
B
C
D
E

@  4: E
|
| o  3: D
| |
| o  2: C
| |
| o  1: B
|/
o  0: A

% Rebasing C onto E detaching from B and collapsing
saved backup bundle to 
@  3: Collapsed revision
|  * C
|  * D
o  2: E
|
| o  1: B
|/
o  0: A

Expected A, C, D, E
A
C
D
E