diff tests/test-casefolding.t @ 24621:1784ca148392 stable

dirstate.walk: don't report same file stat multiple times dirstate.walk() generates pairs of filename and a stat-like object. After "hg mv foo Foo", it generates one pair for "foo" and one for "Foo", as it should. However, on case-insensitive file systems, when it tries to stat to get the disk state as well, it gets the same stat result for both names. This confuses at least scmutil._interestingfiles(), making it think that "foo" was forgotten rather than removed. That, in turn, makes "hg addremove" add "foo" back, resulting in both cases in the dirstate, as reported in issue4590. This change only takes care of the "if unknown" branch. A similar fix should perhaps be applied to the other branch.
author Martin von Zweigbergk <martinvonz@google.com>
date Sat, 04 Apr 2015 21:54:12 -0700
parents 45c95e2f99ad
children 75688a6f0bca
line wrap: on
line diff
--- a/tests/test-casefolding.t	Thu Apr 02 21:29:05 2015 +0900
+++ b/tests/test-casefolding.t	Sat Apr 04 21:54:12 2015 -0700
@@ -37,6 +37,15 @@
   $ hg mv A a
   $ hg st
 
+addremove after case-changing rename has no effect (issue4590)
+
+  $ hg mv a A
+  $ hg addremove
+  recording removal of a as rename to A (100% similar)
+  $ hg revert --all
+  forgetting A
+  undeleting a
+
 test changing case of path components
 
   $ mkdir D