Mercurial > hg

changeset 33935:8e472f3b7c63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-casecollision-merge: fix the test D30 (055fee3547df) makes the error message unpredictable, therefore the fix. Differential Revision: https://phab.mercurial-scm.org/D494
author Jun Wu <quark@fb.com>
date Wed, 23 Aug 2017 11:30:25 -0700
parents 6cc8f848b4c3
children c714e82b9ac2
files tests/test-casecollision-merge.t
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-casecollision-merge.t	Sun Aug 20 09:46:27 2017 -0700
+++ b/tests/test-casecollision-merge.t	Wed Aug 23 11:30:25 2017 -0700
@@ -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