|
5413
|
1 |
% initialize darcs repo |
|
|
2 |
Finished recording patch 'p0' |
|
|
3 |
% branch and update |
|
|
4 |
|
|
|
5 |
Copying patch 1 of 1... |
|
|
6 |
Copying patch 1 of 1... done. |
|
|
7 |
Finished getting. |
|
|
8 |
Finished recording patch 'p1.1' |
|
|
9 |
% update source |
|
|
10 |
Finished recording patch 'p1.2' |
|
|
11 |
% merge branch |
|
|
12 |
We have conflicts in the following files: |
|
|
13 |
./a |
|
|
14 |
Finished pulling and applying. |
|
|
15 |
Finished recording patch 'p2' |
|
|
16 |
initializing destination darcs-repo-hg repository |
|
|
17 |
scanning source... |
|
|
18 |
sorting... |
|
|
19 |
converting... |
|
|
20 |
3 p0 |
|
|
21 |
2 p1.2 |
|
|
22 |
1 p1.1 |
|
|
23 |
0 p2 |
|
|
24 |
o 3 "p2" files: a |
|
|
25 |
| |
|
|
26 |
o 2 "p1.1" files: |
|
|
27 |
| |
|
|
28 |
o 1 "p1.2" files: a b |
|
|
29 |
| |
|
|
30 |
o 0 "p0" files: a |
|
|
31 |
|