Mercurial > hg
diff tests/test-graft.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 | fa87536d3d70 |
line wrap: on
line diff
--- a/tests/test-graft.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-graft.t Mon Oct 12 12:44:18 2020 -0700 @@ -85,7 +85,7 @@ $ hg rm -q e $ hg graft --continue abort: no graft in progress - [255] + [20] $ hg revert -r . -q e Need to specify a rev: @@ -130,7 +130,7 @@ $ echo foo > a $ hg graft 1 abort: uncommitted changes - [255] + [20] $ hg revert a Graft a rename: @@ -292,7 +292,7 @@ $ hg ci -m 'commit interrupted graft' abort: graft in progress (use 'hg graft --continue' or 'hg graft --stop' to stop) - [255] + [20] Abort the graft and try committing: