##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Mention 'hg update' to switch branches in help for branch and branches.
Mention 'hg update' to switch branches in help for branch and branches.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r5667:f29b7c84 default
r5999:d1fe1a4e default
Show More
test-convert-darcs.out
29 lines | 579 B | text/plain | TextLexer
/ tests / test-convert-darcs.out
History | Annotation | Raw |Copy content |Copy permalink
% 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