Mercurial > public > mercurial-scm > hg

diff tests/test-commit-interactive.t @ 48363:6a454e7053a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: return more detailed errors when failing to parse or apply patch This patch adds subclasses of `PatchError` so we can distinguish between failure to parse a patch from failure to apply it. It updates the callers to raise either `InputError` or `StateError` depending on which type of error occurred. Differential Revision: https://phab.mercurial-scm.org/D11824
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 19 Nov 2021 12:57:53 -0800
parents 00ae1fb6c459
children 42d2b31cee0b
line wrap: on
line diff
--- a/tests/test-commit-interactive.t	Fri Nov 26 17:22:14 2021 +0100
+++ b/tests/test-commit-interactive.t	Fri Nov 19 12:57:53 2021 -0800
@@ -1494,7 +1494,7 @@
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej
   abort: patch failed to apply
-  [10]
+  [20]
   $ cat editedfile
   This change will not be committed
   This is the second line