changeset 20006 | 9276014db865 |
parent 19900 | 7c21e3398931 |
child 20033 | f962870712da |
--- a/mercurial/scmutil.py Tue Nov 05 09:43:36 2013 +0100 +++ b/mercurial/scmutil.py Tue Nov 12 00:07:23 2013 +0900 @@ -97,9 +97,10 @@ self._newfiles = set() def __call__(self, f): + if f in self._newfiles: + return fl = encoding.lower(f) - if (fl in self._loweredfiles and f not in self._dirstate and - f not in self._newfiles): + if fl in self._loweredfiles and f not in self._dirstate: msg = _('possible case-folding collision for %s') % f if self._abort: raise util.Abort(msg)