D494: test-casecollision-merge: fix the test
quark (Jun Wu)
phabricator at mercurial-scm.org
Wed Aug 23 18:30:41 UTC 2017
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
https://phab.mercurial-scm.org/D30 makes the error message unpredictable, therefore the fix.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D494
AFFECTED FILES
tests/test-casecollision-merge.t
CHANGE DETAILS
diff --git a/tests/test-casecollision-merge.t b/tests/test-casecollision-merge.t
--- a/tests/test-casecollision-merge.t
+++ b/tests/test-casecollision-merge.t
@@ -144,7 +144,7 @@
$ hg commit -m '#4'
$ hg merge
- abort: case-folding collision between a and A
+ abort: case-folding collision between [aA] and [Aa] (re)
[255]
$ hg parents --template '{rev}\n'
4
@@ -157,7 +157,7 @@
$ hg update --clean 2
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg merge
- abort: case-folding collision between a and A
+ abort: case-folding collision between [aA] and [Aa] (re)
[255]
$ hg parents --template '{rev}\n'
2
@@ -327,7 +327,7 @@
$ hg status
A B
$ hg update
- abort: case-folding collision between b and B
+ abort: case-folding collision between [bB] and [Bb] (re)
[255]
$ hg update --check
To: quark, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list