# HG changeset patch # User Patrick Mezard # Date 2008-03-24 16:02:31 # Node ID 2cf67d007f4115db412c8cb58a57233f81bc654b # Parent b40e90341ae24e4f72869ce40b6e98bcf0b2c0a5 test-convert-mtn: test directory move diff --git a/tests/test-convert-mtn b/tests/test-convert-mtn --- a/tests/test-convert-mtn +++ b/tests/test-convert-mtn @@ -55,6 +55,9 @@ mtn add e mtn drop dir/b mtn mv bin bin2 mtn ci -m update2 +# Test directory move +mtn mv dir dir2 +mtn ci -m movedir cd .. echo % convert incrementally @@ -71,5 +74,5 @@ glog echo % manifest hg manifest echo % contents -cat dir/a +cat dir2/a diff --git a/tests/test-convert-mtn.out b/tests/test-convert-mtn.out --- a/tests/test-convert-mtn.out +++ b/tests/test-convert-mtn.out @@ -26,14 +26,20 @@ mtn: dropping dir/b from workspace manif mtn: renaming bin to bin2 in workspace manifest mtn: beginning commit on branch 'com.selenic.test' mtn: committed revision 6c6977a6ef609ec80e40779f89dbd2772c96de62 +mtn: renaming dir to dir2 in workspace manifest +mtn: beginning commit on branch 'com.selenic.test' +mtn: committed revision 5de5abe7c15eae70cf3acdda23c9c319ea50c1af % convert incrementally assuming destination repo.mtn-hg scanning source... sorting... converting... -0 update2 +1 update2 +0 movedir 3 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ 2 "update2" files: bin bin2 dir/b e +@ 3 "movedir" files: dir/a dir2/a +| +o 2 "update2" files: bin bin2 dir/b e | o 1 "update1" files: a bin c dir/a dir/b | @@ -41,7 +47,7 @@ o 0 "initialize" files: a bin c dir/b % manifest bin2 -dir/a +dir2/a e % contents a