7053
|
1 |
% test multiple merges at once |
|
2 |
initializing destination source-hg repository |
|
3 |
scanning source... |
|
4 |
sorting... |
|
5 |
converting... |
|
6 |
4 Initial add |
|
7 |
3 Added branch1 file |
|
8 |
2 Added parent file |
|
9 |
1 Added brach2 file |
|
10 |
0 Merged branches |
|
11 |
o 5 "(octopus merge fixup)" files: |
|
12 |
|\ |
|
13 |
| o 4 "Merged branches" files: file-branch2 |
|
14 |
| |\ |
|
15 |
o---+ 3 "Added brach2 file" files: file-branch2 |
|
16 |
/ / |
|
17 |
| o 2 "Added parent file" files: file-parent |
|
18 |
| | |
|
19 |
o | 1 "Added branch1 file" files: file file-branch1 |
|
20 |
|/ |
|
21 |
o 0 "Initial add" files: file |
|
22 |
|
|
23 |
% manifest of tip |
|
24 |
644 file |
|
25 |
644 file-branch1 |
|
26 |
644 file-branch2 |
|
27 |
644 file-parent |