Mercurial > hg
comparison tests/test-casecollision-merge.t @ 46866:7ce8b4d2bd55
tests: update the detailed exit codes for icasefs gated tests
The fact that there's already a detailed exit code after the last change here in
test-casecollision-merge.t gives me some pause, but maybe it was found and
changed manually?
Differential Revision: https://phab.mercurial-scm.org/D10298
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 03 Apr 2021 15:02:09 -0400 |
parents | f4f07cc92a47 |
children |
comparison
equal
deleted
inserted
replaced
46865:466236e99eac | 46866:7ce8b4d2bd55 |
---|---|
143 $ echo 'modified at #4' > a | 143 $ echo 'modified at #4' > a |
144 $ hg commit -m '#4' | 144 $ hg commit -m '#4' |
145 | 145 |
146 $ hg merge | 146 $ hg merge |
147 abort: case-folding collision between [aA] and [Aa] (re) | 147 abort: case-folding collision between [aA] and [Aa] (re) |
148 [255] | 148 [20] |
149 $ hg parents --template '{rev}\n' | 149 $ hg parents --template '{rev}\n' |
150 4 | 150 4 |
151 $ hg status -A | 151 $ hg status -A |
152 C a | 152 C a |
153 C x | 153 C x |
156 | 156 |
157 $ hg update --clean 2 | 157 $ hg update --clean 2 |
158 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | 158 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
159 $ hg merge | 159 $ hg merge |
160 abort: case-folding collision between [aA] and [Aa] (re) | 160 abort: case-folding collision between [aA] and [Aa] (re) |
161 [255] | 161 [20] |
162 $ hg parents --template '{rev}\n' | 162 $ hg parents --template '{rev}\n' |
163 2 | 163 2 |
164 $ hg status -A | 164 $ hg status -A |
165 C A | 165 C A |
166 $ cat A | 166 $ cat A |
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: case-folding collision between Aa and directory of aA/a | 215 abort: case-folding collision between Aa and directory of aA/a |
216 [255] | 216 [20] |
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 |
221 $ hg up -qC null | 221 $ hg up -qC null |
326 $ hg add B | 326 $ hg add B |
327 $ hg status | 327 $ hg status |
328 A B | 328 A B |
329 $ hg update | 329 $ hg update |
330 abort: case-folding collision between [bB] and [Bb] (re) | 330 abort: case-folding collision between [bB] and [Bb] (re) |
331 [255] | 331 [20] |
332 | 332 |
333 $ hg update --check | 333 $ hg update --check |
334 abort: uncommitted changes | 334 abort: uncommitted changes |
335 [20] | 335 [20] |
336 | 336 |