equal
deleted
inserted
replaced
210 $ touch 000/f |
210 $ touch 000/f |
211 $ touch Aa # test: collision with 'aA/a' |
211 $ touch Aa # test: collision with 'aA/a' |
212 $ hg ci -Aqm1 |
212 $ hg ci -Aqm1 |
213 |
213 |
214 $ hg merge 0 |
214 $ hg merge 0 |
215 abort: Not a directory: '$TESTTMP/directory-casing/aA/a' |
215 abort: case-folding collision between Aa and directory of aA/a |
216 [255] |
216 [255] |
217 (note: no collision between 0 and 00 or 000/f) |
217 (note: no collision between 0 and 00 or 000/f) |
218 |
218 |
219 Directory case-folding collision: |
219 Directory case-folding collision: |
220 |
220 |