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

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

tests: unify test-convert-cvsnt-mergepoints
tests: unify test-convert-cvsnt-mergepoints
Patrick Mezard - - Load All Authors

File last commit:

r12393:84ceedcf stable
r12523:a164a9cf default
Show More
test-convert-darcs.out
45 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-convert-darcs.out
History | Annotation | Raw |Copy content |Copy permalink
% try converting darcs1 repository
darcs-1.0 repository format is unsupported, please upgrade
% initialize darcs repo
Finished recording patch 'p0'
% branch and update
Finished recording patch 'p1.1'
% update source
Finished recording patch 'p1.2'
% merge branch
Backing up ./a(-darcs-backup0)
We have conflicts in the following files:
./a
Finished pulling and applying.
Finished recording patch 'p2'
% test file and directory move
Finished recording patch 'p3'
% test utf-8 commit message and author
Finished recording patch 'p4: desc ñ'
initializing destination darcs-repo-hg repository
scanning source...
sorting...
converting...
5 p0
4 p1.2
3 p1.1
2 p2
1 p3
0 p4: desc ?
o 5 "p4: desc ñ" (author ñ) files: g
|
o 4 "p3" (test@example.org) files: dir/d dir/d2 dir2/d f ff
|
o 3 "p2" (test@example.org) files: a dir/d dir/d2 f
|
o 2 "p1.1" (test@example.org) files:
|
o 1 "p1.2" (test@example.org) files: a b
|
o 0 "p0" (test@example.org) files: a
7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a
1e88685f5ddec574a34c70af492f95b6debc8741 644 b
37406831adc447ec2385014019599dfec953c806 644 dir2/d
b783a337463792a5c7d548ad85a7d3253c16ba8c 644 ff
0973eb1b2ecc4de7fafe7447ce1b7462108b4848 644 g