Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 6403:f615ece5fec3 | 6404:f08662abdf3f |
|---|---|
| 27 mtn: beginning commit on branch 'com.selenic.test' | 27 mtn: beginning commit on branch 'com.selenic.test' |
| 28 mtn: committed revision 6c6977a6ef609ec80e40779f89dbd2772c96de62 | 28 mtn: committed revision 6c6977a6ef609ec80e40779f89dbd2772c96de62 |
| 29 mtn: renaming dir to dir2 in workspace manifest | 29 mtn: renaming dir to dir2 in workspace manifest |
| 30 mtn: beginning commit on branch 'com.selenic.test' | 30 mtn: beginning commit on branch 'com.selenic.test' |
| 31 mtn: committed revision 5de5abe7c15eae70cf3acdda23c9c319ea50c1af | 31 mtn: committed revision 5de5abe7c15eae70cf3acdda23c9c319ea50c1af |
| 32 mtn: adding dir2/dir to workspace manifest | |
| 33 mtn: adding dir2/dir/emptydir to workspace manifest | |
| 34 mtn: adding dir2/dir/subdir to workspace manifest | |
| 35 mtn: adding dir2/dir/subdir/f to workspace manifest | |
| 36 mtn: beginning commit on branch 'com.selenic.test' | |
| 37 mtn: committed revision 27a423be1e406595cc57f50f42a8790fa0a93d8e | |
| 38 mtn: dropping dir2/dir/subdir/f from workspace manifest | |
| 39 mtn: dropping dir2/dir/subdir from workspace manifest | |
| 40 mtn: dropping dir2/dir/emptydir from workspace manifest | |
| 41 mtn: dropping dir2/dir from workspace manifest | |
| 42 mtn: beginning commit on branch 'com.selenic.test' | |
| 43 mtn: committed revision ba57ba5ac63178529d37fa8a2a1a012fc0e42047 | |
| 32 % convert incrementally | 44 % convert incrementally |
| 33 assuming destination repo.mtn-hg | 45 assuming destination repo.mtn-hg |
| 34 scanning source... | 46 scanning source... |
| 35 sorting... | 47 sorting... |
| 36 converting... | 48 converting... |
| 37 1 update2 | 49 3 update2 |
| 38 0 movedir | 50 2 movedir |
| 51 1 emptydir | |
| 52 0 dropdirectory | |
| 39 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 53 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 40 @ 3 "movedir" files: dir/a dir2/a | 54 @ 5 "dropdirectory" files: dir2/dir/subdir/f |
| 55 | | |
| 56 o 4 "emptydir" files: dir2/dir/subdir/f | |
| 57 | | |
| 58 o 3 "movedir" files: dir/a dir2/a | |
| 41 | | 59 | |
| 42 o 2 "update2" files: bin bin2 dir/b e | 60 o 2 "update2" files: bin bin2 dir/b e |
| 43 | | 61 | |
| 44 o 1 "update1" files: a bin c dir/a dir/b | 62 o 1 "update1" files: a bin c dir/a dir/b |
| 45 | | 63 | |