Mercurial > hg
comparison tests/test-fix.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 | 21733e8c924f |
| children | b4694ef45db5 |
comparison
equal
deleted
inserted
replaced
| 45839:ebee234d952a | 45840:527ce85c2e60 |
|---|---|
| 877 [255] | 877 [255] |
| 878 | 878 |
| 879 $ hg --config extensions.rebase= fix -r . | 879 $ hg --config extensions.rebase= fix -r . |
| 880 abort: rebase in progress | 880 abort: rebase in progress |
| 881 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') | 881 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
| 882 [255] | 882 [20] |
| 883 | 883 |
| 884 $ cd .. | 884 $ cd .. |
| 885 | 885 |
| 886 When fixing a file that was renamed, we should diff against the source of the | 886 When fixing a file that was renamed, we should diff against the source of the |
| 887 rename for incremental fixing and we should correctly reproduce the rename in | 887 rename for incremental fixing and we should correctly reproduce the rename in |