Mercurial > hg
comparison tests/test-merge1.t @ 42532: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 |
comparison
equal
deleted
inserted
replaced
| 42531:5bddd2244814 | 42532:12243f15d53e |
|---|---|
| 42 commit #0 | 42 commit #0 |
| 43 branch: default | 43 branch: default |
| 44 commit: 1 unknown (interrupted update) | 44 commit: 1 unknown (interrupted update) |
| 45 update: 1 new changesets (update) | 45 update: 1 new changesets (update) |
| 46 phases: 2 draft | 46 phases: 2 draft |
| 47 Detect interrupted update by hg status --verbose | |
| 48 $ hg status -v | |
| 49 ? b/nonempty | |
| 50 # The repository is in an unfinished *update* state. | |
| 51 | |
| 52 # To continue: hg update | |
| 53 | |
| 47 | 54 |
| 48 $ rm b/nonempty | 55 $ rm b/nonempty |
| 49 | 56 |
| 50 $ hg up | 57 $ hg up |
| 51 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |