$ PATH="`pwd`/../hg-python26:`pwd`/..:$PATH" ./run-tests.py -l test-casefolding.t

16279

$ PATH="`pwd`/../hg-python26:`pwd`/..:$PATH" ./run-tests.py -l test-casefolding.t # 16279 (531e69ff348f)

--- c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-casefolding.t 
+++ c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-casefolding.t.err 
@@ -66,10 +66,17 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo gold > a
   $ hg up
-  a: untracked file differs
-  abort: untracked files in working directory differ from files in requested revision
-  [255]
+  merging A
+  warning: conflicts during merge.
+  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+  [1]
   $ cat a
+  <<<<<<< local
   gold
+  =======
+  A
+  >>>>>>> other
 
   $ cd ..

ERROR: c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-casefolding.t output changed
!
Failed test-casefolding.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.

16285

$ PATH="`pwd`/../hg-python26:`pwd`/..:$PATH" ./run-tests.py -l test-casefolding.t # 16285 (e53c0b2d7b60)

--- c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-casefolding.t 
+++ c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-casefolding.t.err 
@@ -27,12 +27,13 @@
   a
   committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9
   $ hg mv a A
-  A: not overwriting - file exists
 
 'a' used to be removed under windows
 
   $ test -f a || echo 'a is missing'
   $ hg st
+  A A
+  R a
   $ cd ..
 
 test case collision between revisions (issue912)

ERROR: c:\MinGW\msys\1.0\home\takumi\hg-2.1\tests\test-casefolding.t output changed
!
Failed test-casefolding.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.

16295

$ PATH="`pwd`/../hg-python26:`pwd`/..:$PATH" ./run-tests.py -l test-casefolding.t # 16295 (ba42eb722bb3)
.
# Ran 1 tests, 0 skipped, 0 failed.