tests/test-convert-darcs.out
author Matt Mackall <mpm@selenic.com>
Thu, 23 Apr 2009 15:40:10 -0500
changeset 8145 0c2ba48415c8
parent 5667 f29b7c8419cb
child 9326 b236f34ec1e9
permissions -rw-r--r--
test-archive: silence stupid messages from GNU tar Recent versions of GNU tar have apparently decided they're old enough that it's ok for them to prattle on senselessly about things no one cares about without anyone objecting. We object; apply duct tape.

% initialize darcs repo
Finished recording patch 'p0'
% branch and update
Finished recording patch 'p1.1'
% update source
Finished recording patch 'p1.2'
% merge branch
We have conflicts in the following files:
./a
Finished pulling and applying.
Finished recording patch 'p2'
initializing destination darcs-repo-hg repository
scanning source...
sorting...
converting...
3 p0
2 p1.2
1 p1.1
0 p2
o  3 "p2" files: a
|
o  2 "p1.1" files:
|
o  1 "p1.2" files: a b
|
o  0 "p0" files: a

7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a
1e88685f5ddec574a34c70af492f95b6debc8741 644   b