Mercurial > hg
comparison tests/test-commit-interactive.t @ 48363:6a454e7053a1
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 |
comparison
equal
deleted
inserted
replaced
| 48362:7e6488aa1261 | 48363:6a454e7053a1 |
|---|---|
| 1492 | 1492 |
| 1493 patching file editedfile | 1493 patching file editedfile |
| 1494 Hunk #1 FAILED at 0 | 1494 Hunk #1 FAILED at 0 |
| 1495 1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej | 1495 1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej |
| 1496 abort: patch failed to apply | 1496 abort: patch failed to apply |
| 1497 [10] | 1497 [20] |
| 1498 $ cat editedfile | 1498 $ cat editedfile |
| 1499 This change will not be committed | 1499 This change will not be committed |
| 1500 This is the second line | 1500 This is the second line |
| 1501 This line has been added | 1501 This line has been added |
| 1502 $ hg cat -r tip editedfile | 1502 $ hg cat -r tip editedfile |