mercurial/cmdutil.py
branchstable
changeset 24548 c780a63f61ca
parent 24169 ac41aa4a66ab
child 24554 6e73c66a6919
--- a/mercurial/cmdutil.py	Tue Mar 31 11:11:39 2015 -0400
+++ b/mercurial/cmdutil.py	Tue Mar 31 17:42:46 2015 -0400
@@ -2044,6 +2044,12 @@
             if f not in repo.dirstate and not repo.wvfs.isdir(f):
                 if f not in forgot:
                     if repo.wvfs.exists(f):
+                        # Don't complain if the exact case match wasn't given.
+                        # But don't do this until after checking 'forgot', so
+                        # that subrepo files aren't normalized, and this op is
+                        # purely from data cached by the status walk above.
+                        if repo.dirstate.normalize(f) in repo.dirstate:
+                            continue
                         ui.warn(_('not removing %s: '
                                   'file is already untracked\n')
                                 % match.rel(f))