equal
deleted
inserted
replaced
141 $ echo A > A |
141 $ echo A > A |
142 $ hg add A |
142 $ hg add A |
143 $ hg commit -m '#2' |
143 $ hg commit -m '#2' |
144 |
144 |
145 $ hg update 0 |
145 $ hg update 0 |
146 abort: case-folding collision between a and A |
146 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
147 [255] |
147 $ hg parents --template '{rev}\n' |
148 $ hg parents --template '{rev}\n' |
148 0 |
149 2 |
149 $ hg status -A |
150 $ hg status -A |
150 C a |
151 C A |
151 $ cat A |
152 $ cat A |
152 a |
153 A |
153 $ hg up -qC 2 |
154 |
154 |
155 $ hg update --check 0 |
155 $ hg update --check 0 |
156 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
156 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
157 $ hg parents --template '{rev}\n' |
157 $ hg parents --template '{rev}\n' |
158 0 |
158 0 |