Mercurial > hg
diff tests/test-branch-change.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 | f96fa4de5055 |
line wrap: on
line diff
--- a/tests/test-branch-change.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-branch-change.t Mon Oct 12 12:44:18 2020 -0700 @@ -65,7 +65,7 @@ $ echo bar > a $ hg branch -r . foo abort: uncommitted changes - [255] + [20] $ hg revert --all reverting a @@ -331,7 +331,7 @@ (branch merge, don't forget to commit) $ hg branch -r . abcd abort: outstanding uncommitted merge - [255] + [20] $ hg ci -m "Merge commit" $ hg glog -r 'parents(.)::'