Mercurial > public > mercurial-scm > hg-stable
diff tests/test-pathconflicts-update.t @ 45859: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 | 2a774cae3a03 |
| children | dc00324e80f4 |
line wrap: on
line diff
--- a/tests/test-pathconflicts-update.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-pathconflicts-update.t Mon Oct 12 12:44:18 2020 -0700 @@ -129,7 +129,7 @@ R base $ hg up --check dir abort: uncommitted changes - [255] + [20] $ hg up dir a: path conflict - a file or link has the same name as a directory the local file has been renamed to a~d20a80d4def3 @@ -154,7 +154,7 @@ $ echo 9 > a/b/c $ hg up file2 --check --config merge.checkunknown=warn abort: uncommitted changes - [255] + [20] $ hg up file2 --clean 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark file2)