Mercurial > hg
diff tests/test-shelve2.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 | 21733e8c924f |
children | 832a6a2efe4f |
line wrap: on
line diff
--- a/tests/test-shelve2.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-shelve2.t Mon Oct 12 12:44:18 2020 -0700 @@ -737,7 +737,7 @@ #if abortflag $ hg unshelve --abort abort: no unshelve in progress - [255] + [20] #else $ hg abort aborting the merge, updating back to 9451eaa6eee3 @@ -912,7 +912,7 @@ $ hg merge --abort abort: cannot abort merge with unshelve in progress (use 'hg unshelve --continue' or 'hg unshelve --abort') - [255] + [20] $ hg unshelve --abort unshelve of 'default' aborted