Mercurial > hg
comparison tests/test-resolve.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 | 8d72e29ad1e0 |
| children | ac362d5a7893 |
comparison
equal
deleted
inserted
replaced
| 45839:ebee234d952a | 45840:527ce85c2e60 |
|---|---|
| 130 | 130 |
| 131 resolve --all should abort when no merge in progress | 131 resolve --all should abort when no merge in progress |
| 132 | 132 |
| 133 $ hg resolve --all | 133 $ hg resolve --all |
| 134 abort: resolve command not applicable when not merging | 134 abort: resolve command not applicable when not merging |
| 135 [255] | 135 [20] |
| 136 | 136 |
| 137 resolve -m should abort when no merge in progress | 137 resolve -m should abort when no merge in progress |
| 138 | 138 |
| 139 $ hg resolve -m | 139 $ hg resolve -m |
| 140 abort: resolve command not applicable when not merging | 140 abort: resolve command not applicable when not merging |
| 141 [255] | 141 [20] |
| 142 | 142 |
| 143 can not update or merge when there are unresolved conflicts | 143 can not update or merge when there are unresolved conflicts |
| 144 | 144 |
| 145 $ hg up -qC 0 | 145 $ hg up -qC 0 |
| 146 $ echo quux >> file1 | 146 $ echo quux >> file1 |
| 330 $ hg --config commands.resolve.mark-check=abort resolve -m | 330 $ hg --config commands.resolve.mark-check=abort resolve -m |
| 331 warning: the following files still have conflict markers: | 331 warning: the following files still have conflict markers: |
| 332 file2 | 332 file2 |
| 333 abort: conflict markers detected | 333 abort: conflict markers detected |
| 334 (use --all to mark anyway) | 334 (use --all to mark anyway) |
| 335 [255] | 335 [20] |
| 336 $ hg resolve -l | 336 $ hg resolve -l |
| 337 U file1 | 337 U file1 |
| 338 U file2 | 338 U file2 |
| 339 Try with --all from the hint | 339 Try with --all from the hint |
| 340 $ hg --config commands.resolve.mark-check=abort resolve -m --all | 340 $ hg --config commands.resolve.mark-check=abort resolve -m --all |