Mercurial > public > mercurial-scm > hg-stable
diff tests/test-merge4.t @ 45910:fc4fb2f17dd4
errors: use exit code 10 for parse errors
Now that `ParseError`s raised while reading the config file has been
converted into `ConfigError`s, the remaining parse errors should all
be "input errors" (i.e. exit code 10), according to
https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan.
Differential Revision: https://phab.mercurial-scm.org/D9332
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 16 Nov 2020 16:00:50 -0800 |
| parents | 8561ad49915d |
| children | 55c6ebd11cb9 |
line wrap: on
line diff
--- a/tests/test-merge4.t Fri Nov 20 14:43:21 2020 -0800 +++ b/tests/test-merge4.t Mon Nov 16 16:00:50 2020 -0800 @@ -29,10 +29,10 @@ # Bad usage $ hg log -r 'conflictlocal(foo)' hg: parse error: conflictlocal takes no arguments - [255] + [10] $ hg log -r 'conflictother(foo)' hg: parse error: conflictother takes no arguments - [255] + [10] $ hg co -C . 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # No merge parents when not merging