Mercurial > public > mercurial-scm > hg-stable
diff tests/test-merge1.t @ 42539:12243f15d53e
statecheck: added support for STATES
This removes `STATES` from `state.py` and adds support to
`statecheck` class to handle its features.
`getrepostate()` function is modified accordingly.
This adds a method 'cmdutil.addunfinished()' for appending to
the unfinishedstate list so as to keep 'merge' and 'bisect' at the last.
This also makes two separate message formats for `checkunfinished()` and
`getrepostate()` as there were previously present.
Results of test changed are shown.
Differential Revision: https://phab.mercurial-scm.org/D6503
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Sun, 09 Jun 2019 02:12:58 +0530 |
parents | 07e181ed82ef |
children | 8c4f32b907e6 |
line wrap: on
line diff
--- a/tests/test-merge1.t Sun Jun 09 01:13:13 2019 +0530 +++ b/tests/test-merge1.t Sun Jun 09 02:12:58 2019 +0530 @@ -44,6 +44,13 @@ commit: 1 unknown (interrupted update) update: 1 new changesets (update) phases: 2 draft +Detect interrupted update by hg status --verbose + $ hg status -v + ? b/nonempty + # The repository is in an unfinished *update* state. + + # To continue: hg update + $ rm b/nonempty