Mercurial > hg
comparison tests/test-split.t @ 45877:ac362d5a7893
errors: introduce CanceledError and use it in a few places
This very similar to earlier patches (e.g. for `InputError`) and part
of https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan.
Differential Revision: https://phab.mercurial-scm.org/D9339
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 22 Oct 2020 14:14:59 -0700 |
| parents | 568c05d8f3d2 |
| children | f4f07cc92a47 |
comparison
equal
deleted
inserted
replaced
| 45876:568c05d8f3d2 | 45877:ac362d5a7893 |
|---|---|
| 157 (enter ? for help) [Ynesfdaq?] y | 157 (enter ? for help) [Ynesfdaq?] y |
| 158 | 158 |
| 159 transaction abort! | 159 transaction abort! |
| 160 rollback completed | 160 rollback completed |
| 161 abort: edit failed: false exited with status 1 | 161 abort: edit failed: false exited with status 1 |
| 162 [255] | 162 [250] |
| 163 $ hg status | 163 $ hg status |
| 164 | 164 |
| 165 $ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py" | 165 $ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py" |
| 166 $ runsplit | 166 $ runsplit |
| 167 diff --git a/a b/a | 167 diff --git a/a b/a |