Mercurial > hg
comparison tests/test-convert-mtn.out @ 8124:d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 22 Apr 2009 10:25:05 +0200 |
parents | 933b874e402f |
children |
comparison
equal
deleted
inserted
replaced
8123:933b874e402f | 8124:d883bfbd2e60 |
---|---|
63 mtn: renaming dir3/a to dir3/d1/a in workspace manifest | 63 mtn: renaming dir3/a to dir3/d1/a in workspace manifest |
64 mtn: skipping dir3, already accounted for in workspace | 64 mtn: skipping dir3, already accounted for in workspace |
65 mtn: renaming dir3/d1 to dir3/d2 in workspace manifest | 65 mtn: renaming dir3/d1 to dir3/d2 in workspace manifest |
66 mtn: beginning commit on branch 'com.selenic.test' | 66 mtn: beginning commit on branch 'com.selenic.test' |
67 mtn: committed revision 8b543a400d3ee7f6d4bb1835b9b9e3747c8cb632 | 67 mtn: committed revision 8b543a400d3ee7f6d4bb1835b9b9e3747c8cb632 |
68 % test directory move into another directory move | |
69 mtn: adding dir4 to workspace manifest | |
70 mtn: adding dir4/a to workspace manifest | |
71 mtn: adding dir5 to workspace manifest | |
72 mtn: beginning commit on branch 'com.selenic.test' | |
73 mtn: committed revision 466e0b2afc7a55aa2b4ab2f57cb240bb6cd66fc7 | |
74 mtn: renaming dir5 to dir6 in workspace manifest | |
75 mtn: skipping dir6, already accounted for in workspace | |
76 mtn: renaming dir4 to dir6/dir4 in workspace manifest | |
77 mtn: beginning commit on branch 'com.selenic.test' | |
78 mtn: committed revision 3d1f77ebad0c23a5d14911be3b670f990991b749 | |
79 % test diverging directory moves | |
80 mtn: adding dir7 to workspace manifest | |
81 mtn: adding dir7/c to workspace manifest | |
82 mtn: adding dir7/dir9 to workspace manifest | |
83 mtn: adding dir7/dir9/b to workspace manifest | |
84 mtn: adding dir7/dir9/dir8 to workspace manifest | |
85 mtn: adding dir7/dir9/dir8/a to workspace manifest | |
86 mtn: beginning commit on branch 'com.selenic.test' | |
87 mtn: committed revision 08a08511f18b428d840199b062de90d0396bc2ed | |
88 mtn: renaming dir7 to dir7-2 in workspace manifest | |
89 mtn: renaming dir7-2/dir9 to dir9-2 in workspace manifest | |
90 mtn: renaming dir9-2/dir8 to dir8-2 in workspace manifest | |
91 mtn: beginning commit on branch 'com.selenic.test' | |
92 mtn: committed revision 4a736634505795f17786fffdf2c9cbf5b11df6f6 | |
68 % convert incrementally | 93 % convert incrementally |
69 assuming destination repo.mtn-hg | 94 assuming destination repo.mtn-hg |
70 scanning source... | 95 scanning source... |
71 sorting... | 96 sorting... |
72 converting... | 97 converting... |
73 7 update2 "with" quotes | 98 11 update2 "with" quotes |
74 6 createdir1 | 99 10 createdir1 |
75 5 movedir1 | 100 9 movedir1 |
76 4 movedir | 101 8 movedir |
77 3 emptydir | 102 7 emptydir |
78 2 dropdirectory | 103 6 dropdirectory |
79 1 dirfilemove | 104 5 dirfilemove |
80 0 dirfilemove2 | 105 4 dirfilemove2 |
81 7 files updated, 0 files merged, 0 files removed, 0 files unresolved | 106 3 dirdirmove |
82 @ 9 "dirfilemove2" files: dir3/a dir3/d2/a | 107 2 dirdirmove2 |
108 1 divergentdirmove | |
109 0 divergentdirmove2 | |
110 11 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
111 @ 13 "divergentdirmove2" files: dir7-2/c dir7/c dir7/dir9/b dir7/dir9/dir8/a dir8-2/a dir9-2/b | |
112 | | |
113 o 12 "divergentdirmove" files: dir7/c dir7/dir9/b dir7/dir9/dir8/a | |
114 | | |
115 o 11 "dirdirmove2" files: dir4/a dir6/dir4/a | |
116 | | |
117 o 10 "dirdirmove" files: dir4/a | |
118 | | |
119 o 9 "dirfilemove2" files: dir3/a dir3/d2/a | |
83 | | 120 | |
84 o 8 "dirfilemove" files: dir3/a | 121 o 8 "dirfilemove" files: dir3/a |
85 | | 122 | |
86 o 7 "dropdirectory" files: dir2/dir/subdir/f | 123 o 7 "dropdirectory" files: dir2/dir/subdir/f |
87 | | 124 | |
104 dir1/subdir2/file1 | 141 dir1/subdir2/file1 |
105 dir1/subdir2_other/file1 | 142 dir1/subdir2_other/file1 |
106 dir2/a | 143 dir2/a |
107 dir2/newfile | 144 dir2/newfile |
108 dir3/d2/a | 145 dir3/d2/a |
146 dir6/dir4/a | |
147 dir7-2/c | |
148 dir8-2/a | |
149 dir9-2/b | |
109 e | 150 e |
110 % contents | 151 % contents |
111 a | 152 a |
112 a | 153 a |
113 % file move | 154 % file move |
133 dir1/subdir2_other/file1 | 174 dir1/subdir2_other/file1 |
134 dir2/a | 175 dir2/a |
135 dir2/newfile | 176 dir2/newfile |
136 dir3/d2/a | 177 dir3/d2/a |
137 e | 178 e |
179 % check file directory directory move | |
180 bin2 | |
181 dir1/subdir2/file1 | |
182 dir1/subdir2_other/file1 | |
183 dir2/a | |
184 dir2/newfile | |
185 dir3/d2/a | |
186 dir6/dir4/a | |
187 e | |
188 % check divergent directory moves | |
189 bin2 | |
190 dir1/subdir2/file1 | |
191 dir1/subdir2_other/file1 | |
192 dir2/a | |
193 dir2/newfile | |
194 dir3/d2/a | |
195 dir6/dir4/a | |
196 dir7-2/c | |
197 dir8-2/a | |
198 dir9-2/b | |
199 e |