Mercurial > hg
diff tests/test-transplant.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 | 768056549737 |
line wrap: on
line diff
--- a/tests/test-transplant.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-transplant.t Mon Oct 12 12:44:18 2020 -0700 @@ -53,12 +53,12 @@ $ hg transplant 1 abort: outstanding uncommitted merge (use 'hg commit' or 'hg merge --abort') - [255] + [20] $ hg up -qC tip $ echo b0 > b1 $ hg transplant 1 abort: uncommitted changes - [255] + [20] $ hg up -qC tip $ echo b2 > b2 $ hg ci -Amb2 -d '1 0' @@ -513,10 +513,10 @@ $ hg continue abort: no transplant to continue (continueflag !) abort: no operation in progress (no-continueflag !) - [255] + [20] $ hg transplant --stop abort: no interrupted transplant found - [255] + [20] $ hg transplant 1 applying 46ae92138f3c patching file foo @@ -571,7 +571,7 @@ $ hg transplant 1:3 abort: transplant in progress (use 'hg transplant --continue' or 'hg transplant --stop') - [255] + [20] $ hg status -v A bar ? added.rej