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