Mercurial > hg
comparison tests/test-merge-subrepos.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 | 4764e8436b2a |
| children | b4ad45f2f648 |
comparison
equal
deleted
inserted
replaced
| 45839:ebee234d952a | 45840:527ce85c2e60 |
|---|---|
| 44 update: 1 new changesets, 2 branch heads (merge) | 44 update: 1 new changesets, 2 branch heads (merge) |
| 45 phases: 5 draft | 45 phases: 5 draft |
| 46 | 46 |
| 47 $ hg up --check -r '.^' | 47 $ hg up --check -r '.^' |
| 48 abort: uncommitted changes | 48 abort: uncommitted changes |
| 49 [255] | 49 [20] |
| 50 $ hg st -S | 50 $ hg st -S |
| 51 ! a | 51 ! a |
| 52 $ hg up -Cq . | 52 $ hg up -Cq . |
| 53 | 53 |
| 54 Test that dirty is consistent through subrepos | 54 Test that dirty is consistent through subrepos |