Mercurial > hg
changeset 6377:2cf67d007f41
test-convert-mtn: test directory move
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 24 Mar 2008 17:02:31 +0100 |
| parents | b40e90341ae2 |
| children | f0f830114a9b |
| files | tests/test-convert-mtn tests/test-convert-mtn.out |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-mtn Mon Mar 24 17:02:08 2008 +0100 +++ b/tests/test-convert-mtn Mon Mar 24 17:02:31 2008 +0100 @@ -55,6 +55,9 @@ 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 @@ echo % manifest hg manifest echo % contents -cat dir/a +cat dir2/a
--- a/tests/test-convert-mtn.out Mon Mar 24 17:02:08 2008 +0100 +++ b/tests/test-convert-mtn.out Mon Mar 24 17:02:31 2008 +0100 @@ -26,14 +26,20 @@ 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 @@ % manifest bin2 -dir/a +dir2/a e % contents a