Mercurial > hg
comparison tests/test-convert-mtn.out @ 8099:3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)
Reported and investigated by Paul Aurich <paul@darkrain42.org>
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Tue, 21 Apr 2009 14:17:29 +0200 |
| parents | 087cc65bebff |
| children | 933b874e402f |
comparison
equal
deleted
inserted
replaced
| 8081:6c3b8132078e | 8099:3cdf4872941a |
|---|---|
| 3 mtn: adding a to workspace manifest | 3 mtn: adding a to workspace manifest |
| 4 mtn: adding bin to workspace manifest | 4 mtn: adding bin to workspace manifest |
| 5 mtn: adding c to workspace manifest | 5 mtn: adding c to workspace manifest |
| 6 mtn: adding dir to workspace manifest | 6 mtn: adding dir to workspace manifest |
| 7 mtn: adding dir/b to workspace manifest | 7 mtn: adding dir/b to workspace manifest |
| 8 mtn: adding dir/d to workspace manifest | |
| 8 mtn: beginning commit on branch 'com.selenic.test' | 9 mtn: beginning commit on branch 'com.selenic.test' |
| 9 mtn: committed revision 803ef0bf815e35b951dbd4310acd1e45e675016e | 10 mtn: committed revision 0f6e5e4f2e7d2a8ef312408f57618abf026afd90 |
| 10 % update monotone working directory | 11 % update monotone working directory |
| 11 mtn: skipping dir, already accounted for in workspace | 12 mtn: skipping dir, already accounted for in workspace |
| 12 mtn: renaming a to dir/a in workspace manifest | 13 mtn: renaming a to dir/a in workspace manifest |
| 13 mtn: dropping c from workspace manifest | 14 mtn: dropping c from workspace manifest |
| 14 mtn: beginning commit on branch 'com.selenic.test' | 15 mtn: beginning commit on branch 'com.selenic.test' |
| 15 mtn: committed revision 4daf60753d6fe21a06ce5f716303fe55fd6d3a56 | 16 mtn: committed revision 51d0a982464573a2a2cf5ee2c9219c652aaebeff |
| 16 % convert once | 17 % convert once |
| 17 assuming destination repo.mtn-hg | 18 assuming destination repo.mtn-hg |
| 18 initializing destination repo.mtn-hg repository | 19 initializing destination repo.mtn-hg repository |
| 19 scanning source... | 20 scanning source... |
| 20 sorting... | 21 sorting... |
| 23 0 update1 | 24 0 update1 |
| 24 mtn: adding e to workspace manifest | 25 mtn: adding e to workspace manifest |
| 25 mtn: dropping dir/b from workspace manifest | 26 mtn: dropping dir/b from workspace manifest |
| 26 mtn: renaming bin to bin2 in workspace manifest | 27 mtn: renaming bin to bin2 in workspace manifest |
| 27 mtn: beginning commit on branch 'com.selenic.test' | 28 mtn: beginning commit on branch 'com.selenic.test' |
| 28 mtn: committed revision 6c6977a6ef609ec80e40779f89dbd2772c96de62 | 29 mtn: committed revision ebe58335d85d8cb176b6d0a12be04f5314b998da |
| 29 % test directory move | 30 % test directory move |
| 30 mtn: adding dir1 to workspace manifest | 31 mtn: adding dir1 to workspace manifest |
| 31 mtn: adding dir1/subdir1 to workspace manifest | 32 mtn: adding dir1/subdir1 to workspace manifest |
| 32 mtn: adding dir1/subdir1/file1 to workspace manifest | 33 mtn: adding dir1/subdir1/file1 to workspace manifest |
| 33 mtn: adding dir1/subdir2_other to workspace manifest | 34 mtn: adding dir1/subdir2_other to workspace manifest |
| 34 mtn: adding dir1/subdir2_other/file1 to workspace manifest | 35 mtn: adding dir1/subdir2_other/file1 to workspace manifest |
| 35 mtn: beginning commit on branch 'com.selenic.test' | 36 mtn: beginning commit on branch 'com.selenic.test' |
| 36 mtn: committed revision e066b1feb2b7a7110450c2c18b5b4462011427d1 | 37 mtn: committed revision a8d62bc04fee4d2936d28e98bbcc81686dd74306 |
| 37 mtn: skipping dir1, already accounted for in workspace | 38 mtn: skipping dir1, already accounted for in workspace |
| 38 mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest | 39 mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest |
| 39 mtn: beginning commit on branch 'com.selenic.test' | 40 mtn: beginning commit on branch 'com.selenic.test' |
| 40 mtn: committed revision 2ad2409d25bb8d2583b57a3d4c0fa1df62aa1f79 | 41 mtn: committed revision 2c3d241bbbfe538b1b51d910f5676407e3f4d3a6 |
| 41 % test subdirectory move | 42 % test subdirectory move |
| 42 mtn: renaming dir to dir2 in workspace manifest | 43 mtn: renaming dir to dir2 in workspace manifest |
| 44 mtn: dropping dir2/d from workspace manifest | |
| 45 mtn: adding dir2/newfile to workspace manifest | |
| 43 mtn: beginning commit on branch 'com.selenic.test' | 46 mtn: beginning commit on branch 'com.selenic.test' |
| 44 mtn: committed revision a85290b81fc4a8fbce4dc4d956404109842b406e | 47 mtn: committed revision fdb5a02dae8bfce3a79b3393680af471016e1b4c |
| 45 mtn: beginning commit on branch 'com.selenic.test' | 48 mtn: beginning commit on branch 'com.selenic.test' |
| 46 mtn: committed revision 7e3c8746060117104f16ff2d9212cf0f810cbff0 | 49 mtn: committed revision 8bbf76d717001d24964e4604739fdcd0f539fc88 |
| 47 mtn: dropping dir2/dir/subdir/f from workspace manifest | 50 mtn: dropping dir2/dir/subdir/f from workspace manifest |
| 48 mtn: dropping dir2/dir/subdir from workspace manifest | 51 mtn: dropping dir2/dir/subdir from workspace manifest |
| 49 mtn: dropping dir2/dir/emptydir from workspace manifest | 52 mtn: dropping dir2/dir/emptydir from workspace manifest |
| 50 mtn: dropping dir2/dir from workspace manifest | 53 mtn: dropping dir2/dir from workspace manifest |
| 51 mtn: beginning commit on branch 'com.selenic.test' | 54 mtn: beginning commit on branch 'com.selenic.test' |
| 52 mtn: committed revision a97e0433d041a6d253c5dc27e080d544e55d9c19 | 55 mtn: committed revision 2323d4bc324e6c82628dc04d47a9fd32ad24e322 |
| 53 % convert incrementally | 56 % convert incrementally |
| 54 assuming destination repo.mtn-hg | 57 assuming destination repo.mtn-hg |
| 55 scanning source... | 58 scanning source... |
| 56 sorting... | 59 sorting... |
| 57 converting... | 60 converting... |
| 59 4 createdir1 | 62 4 createdir1 |
| 60 3 movedir1 | 63 3 movedir1 |
| 61 2 movedir | 64 2 movedir |
| 62 1 emptydir | 65 1 emptydir |
| 63 0 dropdirectory | 66 0 dropdirectory |
| 64 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | 67 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 65 @ 7 "dropdirectory" files: dir2/dir/subdir/f | 68 @ 7 "dropdirectory" files: dir2/dir/subdir/f |
| 66 | | 69 | |
| 67 o 6 "emptydir" files: dir2/dir/subdir/f | 70 o 6 "emptydir" files: dir2/dir/subdir/f |
| 68 | | 71 | |
| 69 o 5 "movedir" files: dir/a dir2/a | 72 o 5 "movedir" files: dir/a dir/d dir2/a dir2/newfile |
| 70 | | 73 | |
| 71 o 4 "movedir1" files: dir1/subdir1/file1 dir1/subdir2/file1 | 74 o 4 "movedir1" files: dir1/subdir1/file1 dir1/subdir2/file1 |
| 72 | | 75 | |
| 73 o 3 "createdir1" files: dir1/subdir1/file1 dir1/subdir2_other/file1 | 76 o 3 "createdir1" files: dir1/subdir1/file1 dir1/subdir2_other/file1 |
| 74 | | 77 | |
| 75 o 2 "update2 "with" quotes" files: bin bin2 dir/b e | 78 o 2 "update2 "with" quotes" files: bin bin2 dir/b e |
| 76 | | 79 | |
| 77 o 1 "update1" files: a bin c dir/a dir/b | 80 o 1 "update1" files: a bin c dir/a dir/b |
| 78 | | 81 | |
| 79 o 0 "initialize" files: a bin c dir/b | 82 o 0 "initialize" files: a bin c dir/b dir/d |
| 80 | 83 |
| 81 % manifest | 84 % manifest |
| 82 bin2 | 85 bin2 |
| 83 dir1/subdir2/file1 | 86 dir1/subdir2/file1 |
| 84 dir1/subdir2_other/file1 | 87 dir1/subdir2_other/file1 |
| 85 dir2/a | 88 dir2/a |
| 89 dir2/newfile | |
| 86 e | 90 e |
| 87 % contents | 91 % contents |
| 88 a | 92 a |
| 89 a | 93 a |
| 90 % file move | 94 % file move |
| 91 copies: dir/a (a) | 95 copies: dir/a (a) |
| 92 % check directory move | 96 % check directory move |
| 93 bin2 | 97 bin2 |
| 94 dir/a | 98 dir/a |
| 99 dir/d | |
| 95 dir1/subdir2/file1 | 100 dir1/subdir2/file1 |
| 96 dir1/subdir2_other/file1 | 101 dir1/subdir2_other/file1 |
| 97 e | 102 e |
| 98 copies: dir1/subdir2/file1 (dir1/subdir1/file1) | 103 copies: dir1/subdir2/file1 (dir1/subdir1/file1) |
| 104 % check file remove with directory move | |
| 105 bin2 | |
| 106 dir1/subdir2/file1 | |
| 107 dir1/subdir2_other/file1 | |
| 108 dir2/a | |
| 109 dir2/newfile | |
| 110 e |