( )⚙ D494 test-casecollision-merge: fix the test

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D494

test-casecollision-merge: fix the test
ClosedPublic

Authored by quark on Aug 23 2017, 2:30 PM.

Details

Reviewers
dsp
Group Reviewers
hg-reviewers
Commits
rHG8e472f3b7c63: test-casecollision-merge: fix the test
Summary

D30 makes the error message unpredictable, therefore the fix.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 23 2017, 2:30 PM
dsp accepted this revision.Aug 24 2017, 1:05 AM
dsp added a subscriber: dsp.

Thanks

Closed by commit rHG8e472f3b7c63: test-casecollision-merge: fix the test (authored by quark). · Explain WhyAug 27 2017, 8:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-casecollision-merge.t (6 lines)

Diff 1210

tests/test-casecollision-merge.t

$ echo x > x $ echo x > x
$ 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 a and A abort: case-folding collision between [aA] and [Aa] (re)
[255] [255]
$ 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 a and A abort: case-folding collision between [aA] and [Aa] (re)
[255] [255]
$ 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
$ hg update 0 $ hg update 0
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 b and B abort: case-folding collision between [bB] and [Bb] (re)
[255] [255]
$ hg update --check $ hg update --check
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ 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 ..