##// END OF EJS Templates
rebase: avoid redundant merges (issue1301)
rebase: avoid redundant merges (issue1301)

File last commit:

r6873:39b4db2e default
r7278:45495d78 default
Show More
test-convert-mtn.out
68 lines | 2.2 KiB | text/plain | TextLexer
/ tests / test-convert-mtn.out
Patrick Mezard
Add a test for monotone conversion
r6372 % tedious monotone keys configuration
% create monotone repository
mtn: adding a to workspace manifest
mtn: adding bin to workspace manifest
mtn: adding c to workspace manifest
mtn: adding dir to workspace manifest
mtn: adding dir/b to workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 803ef0bf815e35b951dbd4310acd1e45e675016e
% update monotone working directory
mtn: skipping dir, already accounted for in workspace
mtn: renaming a to dir/a in workspace manifest
mtn: dropping c from workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 4daf60753d6fe21a06ce5f716303fe55fd6d3a56
% convert once
assuming destination repo.mtn-hg
initializing destination repo.mtn-hg repository
scanning source...
sorting...
converting...
1 initialize
0 update1
mtn: adding e to workspace manifest
mtn: dropping dir/b from workspace manifest
mtn: renaming bin to bin2 in workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 6c6977a6ef609ec80e40779f89dbd2772c96de62
Patrick Mezard
test-convert-mtn: test directory move
r6377 mtn: renaming dir to dir2 in workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 5de5abe7c15eae70cf3acdda23c9c319ea50c1af
Patrick Mezard
test-convert-mtn: test directory deletion
r6396 mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 27a423be1e406595cc57f50f42a8790fa0a93d8e
mtn: dropping dir2/dir/subdir/f from workspace manifest
mtn: dropping dir2/dir/subdir from workspace manifest
mtn: dropping dir2/dir/emptydir from workspace manifest
mtn: dropping dir2/dir from workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision ba57ba5ac63178529d37fa8a2a1a012fc0e42047
Patrick Mezard
Add a test for monotone conversion
r6372 % convert incrementally
assuming destination repo.mtn-hg
scanning source...
sorting...
converting...
Patrick Mezard
test-convert-mtn: test descriptions with quotes
r6633 3 update2 "with" quotes
Patrick Mezard
test-convert-mtn: test directory deletion
r6396 2 movedir
1 emptydir
0 dropdirectory
Patrick Mezard
convert: record deleted files in monotone source
r6376 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Patrick Mezard
test-convert-mtn: test directory deletion
r6396 @ 5 "dropdirectory" files: dir2/dir/subdir/f
|
o 4 "emptydir" files: dir2/dir/subdir/f
|
o 3 "movedir" files: dir/a dir2/a
Patrick Mezard
test-convert-mtn: test directory move
r6377 |
Patrick Mezard
test-convert-mtn: test descriptions with quotes
r6633 o 2 "update2 "with" quotes" files: bin bin2 dir/b e
Patrick Mezard
Add a test for monotone conversion
r6372 |
Patrick Mezard
convert: record deleted files in monotone source
r6376 o 1 "update1" files: a bin c dir/a dir/b
Patrick Mezard
Add a test for monotone conversion
r6372 |
o 0 "initialize" files: a bin c dir/b
% manifest
bin2
Patrick Mezard
test-convert-mtn: test directory move
r6377 dir2/a
Patrick Mezard
Add a test for monotone conversion
r6372 e
% contents
a
a