Mercurial > hg
diff tests/test-convert-mtn.out @ 6404:f08662abdf3f
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 29 Mar 2008 21:15:54 +0100 |
parents | 18eeabae6148 |
children | 67a2d2d9bf21 |
line wrap: on
line diff
--- a/tests/test-convert-mtn.out Sat Mar 29 21:15:34 2008 +0100 +++ b/tests/test-convert-mtn.out Sat Mar 29 21:15:54 2008 +0100 @@ -29,15 +29,33 @@ mtn: renaming dir to dir2 in workspace manifest mtn: beginning commit on branch 'com.selenic.test' mtn: committed revision 5de5abe7c15eae70cf3acdda23c9c319ea50c1af +mtn: adding dir2/dir to workspace manifest +mtn: adding dir2/dir/emptydir to workspace manifest +mtn: adding dir2/dir/subdir to workspace manifest +mtn: adding dir2/dir/subdir/f to workspace manifest +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 % convert incrementally assuming destination repo.mtn-hg scanning source... sorting... converting... -1 update2 -0 movedir +3 update2 +2 movedir +1 emptydir +0 dropdirectory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ 3 "movedir" files: dir/a dir2/a +@ 5 "dropdirectory" files: dir2/dir/subdir/f +| +o 4 "emptydir" files: dir2/dir/subdir/f +| +o 3 "movedir" files: dir/a dir2/a | o 2 "update2" files: bin bin2 dir/b e |