Mercurial > hg
comparison tests/test-rebase-transaction.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 | 21733e8c924f |
| children | 27fd12eca557 |
comparison
equal
deleted
inserted
replaced
| 45876:568c05d8f3d2 | 45877:ac362d5a7893 |
|---|---|
| 169 rebasing 3:26805aba1e60 C "C" | 169 rebasing 3:26805aba1e60 C "C" |
| 170 rebasing 5:f585351a92f8 D tip "D" | 170 rebasing 5:f585351a92f8 D tip "D" |
| 171 transaction abort! | 171 transaction abort! |
| 172 rollback completed | 172 rollback completed |
| 173 abort: edit failed: false exited with status 1 | 173 abort: edit failed: false exited with status 1 |
| 174 [255] | 174 [250] |
| 175 $ hg tglog | 175 $ hg tglog |
| 176 o 5: D | 176 o 5: D |
| 177 | | 177 | |
| 178 | o 4: Z | 178 | o 4: Z |
| 179 | | | 179 | | |