equal
deleted
inserted
replaced
1 % try converting darcs1 repository |
|
2 darcs-1.0 repository format is unsupported, please upgrade |
|
3 % initialize darcs repo |
|
4 Finished recording patch 'p0' |
|
5 % branch and update |
|
6 Finished recording patch 'p1.1' |
|
7 % update source |
|
8 Finished recording patch 'p1.2' |
|
9 % merge branch |
|
10 Backing up ./a(-darcs-backup0) |
|
11 We have conflicts in the following files: |
|
12 ./a |
|
13 Finished pulling and applying. |
|
14 Finished recording patch 'p2' |
|
15 % test file and directory move |
|
16 Finished recording patch 'p3' |
|
17 % test utf-8 commit message and author |
|
18 Finished recording patch 'p4: desc ñ' |
|
19 initializing destination darcs-repo-hg repository |
|
20 scanning source... |
|
21 sorting... |
|
22 converting... |
|
23 5 p0 |
|
24 4 p1.2 |
|
25 3 p1.1 |
|
26 2 p2 |
|
27 1 p3 |
|
28 0 p4: desc ? |
|
29 o 5 "p4: desc ñ" (author ñ) files: g |
|
30 | |
|
31 o 4 "p3" (test@example.org) files: dir/d dir/d2 dir2/d f ff |
|
32 | |
|
33 o 3 "p2" (test@example.org) files: a dir/d dir/d2 f |
|
34 | |
|
35 o 2 "p1.1" (test@example.org) files: |
|
36 | |
|
37 o 1 "p1.2" (test@example.org) files: a b |
|
38 | |
|
39 o 0 "p0" (test@example.org) files: a |
|
40 |
|
41 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a |
|
42 1e88685f5ddec574a34c70af492f95b6debc8741 644 b |
|
43 37406831adc447ec2385014019599dfec953c806 644 dir2/d |
|
44 b783a337463792a5c7d548ad85a7d3253c16ba8c 644 ff |
|
45 0973eb1b2ecc4de7fafe7447ce1b7462108b4848 644 g |
|