Mercurial > hg
diff tests/test-rebase-parameters.t @ 45840:527ce85c2e60
errors: introduce StateError and use it from commands and cmdutil
This very similar to an earlier patch (which was for `InputError`).
In this patch, I also updated the transplant extension only because
`test-transplant.t` would otherwise have needed a `#if continueflag`.
Differential Revision: https://phab.mercurial-scm.org/D9310
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 12 Oct 2020 12:44:18 -0700 |
| parents | 8d72e29ad1e0 |
| children | 9989a276712f |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-rebase-parameters.t Mon Oct 12 12:44:18 2020 -0700 @@ -500,7 +500,7 @@ $ hg graft --continue abort: no graft in progress (continue: hg rebase --continue) - [255] + [20] $ hg rebase -c --tool internal:fail rebasing 2:e4e3f3546619 tip "c2b" note: not rebasing 2:e4e3f3546619 tip "c2b", its destination already has all its changes