equal
deleted
inserted
replaced
142 created new head |
142 created new head |
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 a and A |
147 abort: case-folding collision between [aA] and [Aa] (re) |
148 [255] |
148 [255] |
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 |
155 modified at #4 |
155 modified at #4 |
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 a and A |
160 abort: case-folding collision between [aA] and [Aa] (re) |
161 [255] |
161 [255] |
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 |
325 $ echo B > B |
325 $ echo B > B |
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 b and B |
330 abort: case-folding collision between [bB] and [Bb] (re) |
331 [255] |
331 [255] |
332 |
332 |
333 $ hg update --check |
333 $ hg update --check |
334 abort: uncommitted changes |
334 abort: uncommitted changes |
335 [255] |
335 [255] |