Mercurial > public > mercurial-scm > hg
diff tests/test-uncommit.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 | b4694ef45db5 |
line wrap: on
line diff
--- a/tests/test-uncommit.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-uncommit.t Mon Oct 12 12:44:18 2020 -0700 @@ -168,11 +168,11 @@ $ hg uncommit abort: uncommitted changes (requires --allow-dirty-working-copy to uncommit) - [255] + [20] $ hg uncommit files abort: uncommitted changes (requires --allow-dirty-working-copy to uncommit) - [255] + [20] $ cat files abcde foo @@ -184,7 +184,7 @@ $ hg uncommit abort: uncommitted changes (requires --allow-dirty-working-copy to uncommit) - [255] + [20] $ hg uncommit --config experimental.uncommitondirtywdir=True $ hg commit -m "files abcde + foo" @@ -407,7 +407,7 @@ $ hg uncommit abort: outstanding uncommitted merge (requires --allow-dirty-working-copy to uncommit) - [255] + [20] $ hg uncommit --config experimental.uncommitondirtywdir=True abort: cannot uncommit while merging @@ -507,7 +507,7 @@ $ hg uncommit b abort: uncommitted changes (requires --allow-dirty-working-copy to uncommit) - [255] + [20] $ hg uncommit --allow-dirty-working-copy b $ hg log changeset: 3:30fa958635b2