test-eol-update: record new results as correct
Changeset
0852da25a31b changed the result of this test. The 'hg update 0'
command, which causes a merge of modified a.txt, now leaves a.txt in the
EOLN format specified by .hgeol as it was committed in revision 0.
Previously, it used the .hgeol contents from the working directory before the
update.
@ 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