Mercurial > hg
comparison tests/test-convert-mtn.out @ 8050:087cc65bebff
convert/mtn: record changes from directory renames (issue1587)
Bug report and initial path by Pavel Volkovitskiy <int@mtx.ru>
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 11 Apr 2009 23:12:42 +0200 |
parents | 39b4db2ea6ed |
children | 3cdf4872941a |
comparison
equal
deleted
inserted
replaced
8049:99e5f97c9a97 | 8050:087cc65bebff |
---|---|
24 mtn: adding e to workspace manifest | 24 mtn: adding e to workspace manifest |
25 mtn: dropping dir/b from workspace manifest | 25 mtn: dropping dir/b from workspace manifest |
26 mtn: renaming bin to bin2 in workspace manifest | 26 mtn: renaming bin to bin2 in workspace manifest |
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 % test directory move | |
30 mtn: adding dir1 to workspace manifest | |
31 mtn: adding dir1/subdir1 to workspace manifest | |
32 mtn: adding dir1/subdir1/file1 to workspace manifest | |
33 mtn: adding dir1/subdir2_other to workspace manifest | |
34 mtn: adding dir1/subdir2_other/file1 to workspace manifest | |
35 mtn: beginning commit on branch 'com.selenic.test' | |
36 mtn: committed revision e066b1feb2b7a7110450c2c18b5b4462011427d1 | |
37 mtn: skipping dir1, already accounted for in workspace | |
38 mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest | |
39 mtn: beginning commit on branch 'com.selenic.test' | |
40 mtn: committed revision 2ad2409d25bb8d2583b57a3d4c0fa1df62aa1f79 | |
41 % test subdirectory move | |
29 mtn: renaming dir to dir2 in workspace manifest | 42 mtn: renaming dir to dir2 in workspace manifest |
30 mtn: beginning commit on branch 'com.selenic.test' | 43 mtn: beginning commit on branch 'com.selenic.test' |
31 mtn: committed revision 5de5abe7c15eae70cf3acdda23c9c319ea50c1af | 44 mtn: committed revision a85290b81fc4a8fbce4dc4d956404109842b406e |
32 mtn: beginning commit on branch 'com.selenic.test' | 45 mtn: beginning commit on branch 'com.selenic.test' |
33 mtn: committed revision 27a423be1e406595cc57f50f42a8790fa0a93d8e | 46 mtn: committed revision 7e3c8746060117104f16ff2d9212cf0f810cbff0 |
34 mtn: dropping dir2/dir/subdir/f from workspace manifest | 47 mtn: dropping dir2/dir/subdir/f from workspace manifest |
35 mtn: dropping dir2/dir/subdir from workspace manifest | 48 mtn: dropping dir2/dir/subdir from workspace manifest |
36 mtn: dropping dir2/dir/emptydir from workspace manifest | 49 mtn: dropping dir2/dir/emptydir from workspace manifest |
37 mtn: dropping dir2/dir from workspace manifest | 50 mtn: dropping dir2/dir from workspace manifest |
38 mtn: beginning commit on branch 'com.selenic.test' | 51 mtn: beginning commit on branch 'com.selenic.test' |
39 mtn: committed revision ba57ba5ac63178529d37fa8a2a1a012fc0e42047 | 52 mtn: committed revision a97e0433d041a6d253c5dc27e080d544e55d9c19 |
40 % convert incrementally | 53 % convert incrementally |
41 assuming destination repo.mtn-hg | 54 assuming destination repo.mtn-hg |
42 scanning source... | 55 scanning source... |
43 sorting... | 56 sorting... |
44 converting... | 57 converting... |
45 3 update2 "with" quotes | 58 5 update2 "with" quotes |
59 4 createdir1 | |
60 3 movedir1 | |
46 2 movedir | 61 2 movedir |
47 1 emptydir | 62 1 emptydir |
48 0 dropdirectory | 63 0 dropdirectory |
49 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 64 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
50 @ 5 "dropdirectory" files: dir2/dir/subdir/f | 65 @ 7 "dropdirectory" files: dir2/dir/subdir/f |
51 | | 66 | |
52 o 4 "emptydir" files: dir2/dir/subdir/f | 67 o 6 "emptydir" files: dir2/dir/subdir/f |
53 | | 68 | |
54 o 3 "movedir" files: dir/a dir2/a | 69 o 5 "movedir" files: dir/a dir2/a |
70 | | |
71 o 4 "movedir1" files: dir1/subdir1/file1 dir1/subdir2/file1 | |
72 | | |
73 o 3 "createdir1" files: dir1/subdir1/file1 dir1/subdir2_other/file1 | |
55 | | 74 | |
56 o 2 "update2 "with" quotes" files: bin bin2 dir/b e | 75 o 2 "update2 "with" quotes" files: bin bin2 dir/b e |
57 | | 76 | |
58 o 1 "update1" files: a bin c dir/a dir/b | 77 o 1 "update1" files: a bin c dir/a dir/b |
59 | | 78 | |
60 o 0 "initialize" files: a bin c dir/b | 79 o 0 "initialize" files: a bin c dir/b |
61 | 80 |
62 % manifest | 81 % manifest |
63 bin2 | 82 bin2 |
83 dir1/subdir2/file1 | |
84 dir1/subdir2_other/file1 | |
64 dir2/a | 85 dir2/a |
65 e | 86 e |
66 % contents | 87 % contents |
67 a | 88 a |
68 a | 89 a |
90 % file move | |
91 copies: dir/a (a) | |
92 % check directory move | |
93 bin2 | |
94 dir/a | |
95 dir1/subdir2/file1 | |
96 dir1/subdir2_other/file1 | |
97 e | |
98 copies: dir1/subdir2/file1 (dir1/subdir1/file1) |