Mercurial > hg
diff tests/test-rebase-abort.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 | 5a0b930cfb3e |
line wrap: on
line diff
--- a/tests/test-rebase-abort.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-rebase-abort.t Mon Oct 12 12:44:18 2020 -0700 @@ -328,7 +328,7 @@ $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') - [255] + [20] $ cat a new @@ -398,20 +398,20 @@ $ hg rebase -s 3 -d tip abort: rebase in progress (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') - [255] + [20] $ hg up . abort: rebase in progress (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') - [255] + [20] $ hg up -C . abort: rebase in progress (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') - [255] + [20] $ hg graft 3 abort: rebase in progress (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') - [255] + [20] $ hg abort saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg