Mercurial > hg
comparison tests/test-graft.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 | 8988e640a8ac |
children | 5171937ad0f9 |
comparison
equal
deleted
inserted
replaced
42531:5bddd2244814 | 42532:12243f15d53e |
---|---|
279 # | 279 # |
280 # To mark files as resolved: hg resolve --mark FILE | 280 # To mark files as resolved: hg resolve --mark FILE |
281 | 281 |
282 # To continue: hg graft --continue | 282 # To continue: hg graft --continue |
283 # To abort: hg graft --abort | 283 # To abort: hg graft --abort |
284 # To stop: hg graft --stop | |
284 | 285 |
285 | 286 |
286 Commit while interrupted should fail: | 287 Commit while interrupted should fail: |
287 | 288 |
288 $ hg ci -m 'commit interrupted graft' | 289 $ hg ci -m 'commit interrupted graft' |