equal
deleted
inserted
replaced
189 M x |
189 M x |
190 C A |
190 C A |
191 |
191 |
192 $ cd .. |
192 $ cd .. |
193 |
193 |
|
194 Prepare for tests of directory case-folding collisions |
|
195 |
|
196 $ hg init directory-casing |
|
197 $ cd directory-casing |
|
198 $ touch 0 # test: file without directory |
|
199 $ mkdir 0a |
|
200 $ touch 0a/f |
|
201 $ mkdir aA |
|
202 $ touch aA/a |
|
203 $ hg ci -Aqm0 |
|
204 |
|
205 Directory/file case-folding collision: |
|
206 |
|
207 $ hg up -q null |
|
208 $ touch 00 # test: starts as '0' |
|
209 $ mkdir 000 # test: starts as '0' |
|
210 $ touch 000/f |
|
211 $ touch Aa # test: collision with 'aA/a' |
|
212 $ hg ci -Aqm1 |
|
213 |
|
214 $ hg merge 0 |
|
215 abort: Not a directory: '$TESTTMP/directory-casing/aA/a' |
|
216 [255] |
|
217 (note: no collision between 0 and 00 or 000/f) |
|
218 |
|
219 Directory case-folding collision: |
|
220 |
|
221 $ hg up -qC null |
|
222 $ hg --config extensions.purge= purge |
|
223 $ mkdir 0A0 |
|
224 $ touch 0A0/f # test: starts as '0a' |
|
225 $ mkdir Aa |
|
226 $ touch Aa/b # test: collision with 'aA/a' |
|
227 $ hg ci -Aqm2 |
|
228 |
|
229 $ hg merge 0 |
|
230 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
231 (branch merge, don't forget to commit) |
|
232 |
|
233 $ cd .. |
194 |
234 |
195 ################################ |
235 ################################ |
196 test for linear updates |
236 test for linear updates |
197 ################################ |
237 ################################ |
198 |
238 |