##// END OF EJS Templates
Merge with i18n
Merge with i18n

File last commit:

r9527:b3c13e72 default
r10489:3232dba5 merge stable
Show More
test-convert-darcs.out
37 lines | 839 B | text/plain | TextLexer
/ tests / test-convert-darcs.out
Patrick Mezard
Test darcs converter
r5413 % initialize darcs repo
Finished recording patch 'p0'
% branch and update
Finished recording patch 'p1.1'
% update source
Finished recording patch 'p1.2'
% merge branch
Bryan O'Sullivan
Fix failing darcs test
r9525 Backing up ./a(-darcs-backup0)
Patrick Mezard
Test darcs converter
r5413 We have conflicts in the following files:
./a
Finished pulling and applying.
Finished recording patch 'p2'
Patrick Mezard
convert/darcs: fix file renaming (issue1853)
r9526 % test file and directory move
Finished recording patch 'p3'
Patrick Mezard
Test darcs converter
r5413 initializing destination darcs-repo-hg repository
scanning source...
sorting...
converting...
Patrick Mezard
convert/darcs: fix file renaming (issue1853)
r9526 4 p0
3 p1.2
2 p1.1
1 p2
0 p3
Patrick Mezard
convert/darcs: handle directory renaming
r9527 o 4 "p3" files: dir/d dir/d2 dir2/d f ff
Patrick Mezard
convert/darcs: fix file renaming (issue1853)
r9526 |
Patrick Mezard
convert/darcs: handle directory renaming
r9527 o 3 "p2" files: a dir/d dir/d2 f
Patrick Mezard
Test darcs converter
r5413 |
o 2 "p1.1" files:
|
o 1 "p1.2" files: a b
|
o 0 "p0" files: a
7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a
1e88685f5ddec574a34c70af492f95b6debc8741 644 b
Patrick Mezard
convert/darcs: handle directory renaming
r9527 d278f41640da5fc303a4cf9894af31c2983fc11d 644 dir2/d
Patrick Mezard
convert/darcs: fix file renaming (issue1853)
r9526 ef5c76581d78340f568d5f48d679bf307452cbc9 644 ff