equal
deleted
inserted
replaced
8 Backing up ./a(-darcs-backup0) |
8 Backing up ./a(-darcs-backup0) |
9 We have conflicts in the following files: |
9 We have conflicts in the following files: |
10 ./a |
10 ./a |
11 Finished pulling and applying. |
11 Finished pulling and applying. |
12 Finished recording patch 'p2' |
12 Finished recording patch 'p2' |
|
13 % test file and directory move |
|
14 Finished recording patch 'p3' |
13 initializing destination darcs-repo-hg repository |
15 initializing destination darcs-repo-hg repository |
14 scanning source... |
16 scanning source... |
15 sorting... |
17 sorting... |
16 converting... |
18 converting... |
17 3 p0 |
19 4 p0 |
18 2 p1.2 |
20 3 p1.2 |
19 1 p1.1 |
21 2 p1.1 |
20 0 p2 |
22 1 p2 |
21 o 3 "p2" files: a |
23 0 p3 |
|
24 o 4 "p3" files: f ff |
|
25 | |
|
26 o 3 "p2" files: a f |
22 | |
27 | |
23 o 2 "p1.1" files: |
28 o 2 "p1.1" files: |
24 | |
29 | |
25 o 1 "p1.2" files: a b |
30 o 1 "p1.2" files: a b |
26 | |
31 | |
27 o 0 "p0" files: a |
32 o 0 "p0" files: a |
28 |
33 |
29 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a |
34 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a |
30 1e88685f5ddec574a34c70af492f95b6debc8741 644 b |
35 1e88685f5ddec574a34c70af492f95b6debc8741 644 b |
|
36 ef5c76581d78340f568d5f48d679bf307452cbc9 644 ff |