subrepo: correctly handle update -C with modified subrepos (
issue2022)
(based on a patch by Saint Germain)
@ 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