##// END OF EJS Templates
errors: use detailed exit code for detected case-collision...
Martin von Zweigbergk -
r49190:0b8e076e default
parent child Browse files
Show More
@@ -341,7 +341,7 class casecollisionauditor(object):
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)
@@ -12,7 +12,7 test file addition with colliding case
12 ? A
12 ? A
13 $ hg add --config ui.portablefilenames=abort A
13 $ hg add --config ui.portablefilenames=abort A
14 abort: possible case-folding collision for A
14 abort: possible case-folding collision for A
15 [255]
15 [20]
16 $ hg st
16 $ hg st
17 A a
17 A a
18 ? A
18 ? A
General Comments 0
You need to be logged in to leave comments. Login now