equal
deleted
inserted
replaced
339 return |
339 return |
340 fl = encoding.lower(f) |
340 fl = encoding.lower(f) |
341 if fl in self._loweredfiles and f not in self._dirstate: |
341 if fl in self._loweredfiles and f not in self._dirstate: |
342 msg = _(b'possible case-folding collision for %s') % f |
342 msg = _(b'possible case-folding collision for %s') % f |
343 if self._abort: |
343 if self._abort: |
344 raise error.Abort(msg) |
344 raise error.StateError(msg) |
345 self._ui.warn(_(b"warning: %s\n") % msg) |
345 self._ui.warn(_(b"warning: %s\n") % msg) |
346 self._loweredfiles.add(fl) |
346 self._loweredfiles.add(fl) |
347 self._newfiles.add(f) |
347 self._newfiles.add(f) |
348 |
348 |
349 |
349 |