author | Bryan O'Sullivan <bos@serpentine.com> |
Thu, 06 Aug 2009 21:35:25 -0700 | |
changeset 9326 | b236f34ec1e9 |
parent 5667 | f29b7c8419cb |
child 9526 | 457a30ed8ffb |
permissions | -rw-r--r-- |
5413 | 1 |
% initialize darcs repo |
2 |
Finished recording patch 'p0' |
|
3 |
% branch and update |
|
4 |
Finished recording patch 'p1.1' |
|
5 |
% update source |
|
6 |
Finished recording patch 'p1.2' |
|
7 |
% merge branch |
|
9326
b236f34ec1e9
Fix failing darcs test
Bryan O'Sullivan <bos@serpentine.com>
parents:
5667
diff
changeset
|
8 |
Backing up ./a(-darcs-backup0) |
5413 | 9 |
We have conflicts in the following files: |
10 |
./a |
|
11 |
Finished pulling and applying. |
|
12 |
Finished recording patch 'p2' |
|
13 |
initializing destination darcs-repo-hg repository |
|
14 |
scanning source... |
|
15 |
sorting... |
|
16 |
converting... |
|
17 |
3 p0 |
|
18 |
2 p1.2 |
|
19 |
1 p1.1 |
|
20 |
0 p2 |
|
21 |
o 3 "p2" files: a |
|
22 |
| |
|
23 |
o 2 "p1.1" files: |
|
24 |
| |
|
25 |
o 1 "p1.2" files: a b |
|
26 |
| |
|
27 |
o 0 "p0" files: a |
|
28 |
||
29 |
7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a |
|
30 |
1e88685f5ddec574a34c70af492f95b6debc8741 644 b |