| pulkit |
| hg-reviewers |
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?
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-casecollision-merge.t (8 lines) | |||
| M | tests/test-casefolding.t (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| $ hg add x | $ hg add x | ||||
| $ hg commit -m '#3' | $ hg commit -m '#3' | ||||
| created new head | created new head | ||||
| $ echo 'modified at #4' > a | $ echo 'modified at #4' > a | ||||
| $ hg commit -m '#4' | $ hg commit -m '#4' | ||||
| $ hg merge | $ hg merge | ||||
| abort: case-folding collision between [aA] and [Aa] (re) | abort: case-folding collision between [aA] and [Aa] (re) | ||||
| [255] | [20] | ||||
| $ hg parents --template '{rev}\n' | $ hg parents --template '{rev}\n' | ||||
| 4 | 4 | ||||
| $ hg status -A | $ hg status -A | ||||
| C a | C a | ||||
| C x | C x | ||||
| $ cat a | $ cat a | ||||
| modified at #4 | modified at #4 | ||||
| $ hg update --clean 2 | $ hg update --clean 2 | ||||
| 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
| $ hg merge | $ hg merge | ||||
| abort: case-folding collision between [aA] and [Aa] (re) | abort: case-folding collision between [aA] and [Aa] (re) | ||||
| [255] | [20] | ||||
| $ hg parents --template '{rev}\n' | $ hg parents --template '{rev}\n' | ||||
| 2 | 2 | ||||
| $ hg status -A | $ hg status -A | ||||
| C A | C A | ||||
| $ cat A | $ cat A | ||||
| A | A | ||||
| test for deletion awareness of case-folding collision check (issue3648): | test for deletion awareness of case-folding collision check (issue3648): | ||||
| $ touch 00 # test: starts as '0' | $ touch 00 # test: starts as '0' | ||||
| $ mkdir 000 # test: starts as '0' | $ mkdir 000 # test: starts as '0' | ||||
| $ touch 000/f | $ touch 000/f | ||||
| $ touch Aa # test: collision with 'aA/a' | $ touch Aa # test: collision with 'aA/a' | ||||
| $ hg ci -Aqm1 | $ hg ci -Aqm1 | ||||
| $ hg merge 0 | $ hg merge 0 | ||||
| abort: case-folding collision between Aa and directory of aA/a | abort: case-folding collision between Aa and directory of aA/a | ||||
| [255] | [20] | ||||
| (note: no collision between 0 and 00 or 000/f) | (note: no collision between 0 and 00 or 000/f) | ||||
| Directory case-folding collision: | Directory case-folding collision: | ||||
| $ hg up -qC null | $ hg up -qC null | ||||
| $ hg --config extensions.purge= purge | $ hg --config extensions.purge= purge | ||||
| $ mkdir 0A0 | $ mkdir 0A0 | ||||
| $ touch 0A0/f # test: starts as '0a' | $ touch 0A0/f # test: starts as '0a' | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ echo B > B | $ echo B > B | ||||
| $ hg add B | $ hg add B | ||||
| $ hg status | $ hg status | ||||
| A B | A B | ||||
| $ hg update | $ hg update | ||||
| abort: case-folding collision between [bB] and [Bb] (re) | abort: case-folding collision between [bB] and [Bb] (re) | ||||
| [255] | [20] | ||||
| $ hg update --check | $ hg update --check | ||||
| abort: uncommitted changes | abort: uncommitted changes | ||||
| [20] | [20] | ||||
| $ hg update --clean | $ hg update --clean | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ hg parents --template '{rev}\n' | $ hg parents --template '{rev}\n' | ||||
| 1 | 1 | ||||
| $ hg status -A | $ hg status -A | ||||
| C b | C b | ||||
| $ cat b | $ cat b | ||||
| a | a | ||||
| $ cd .. | $ cd .. | ||||
| no clobbering of untracked files with wrong casing | no clobbering of untracked files with wrong casing | ||||
| $ hg up -r null | $ hg up -r null | ||||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ echo gold > a | $ echo gold > a | ||||
| $ hg up | $ hg up | ||||
| A: untracked file differs | A: untracked file differs | ||||
| abort: untracked files in working directory differ from files in requested revision | abort: untracked files in working directory differ from files in requested revision | ||||
| [255] | [20] | ||||
| $ cat a | $ cat a | ||||
| gold | gold | ||||
| $ rm a | $ rm a | ||||
| test that normal file in different case on target context is not | test that normal file in different case on target context is not | ||||
| unlinked by largefiles extension. | unlinked by largefiles extension. | ||||
| $ cat >> .hg/hgrc <<EOF | $ cat >> .hg/hgrc <<EOF | ||||