Mercurial > hg
diff tests/test-rebase-named-branches.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 | f90a5c211251 |
children | 9989a276712f |
line wrap: on
line diff
--- a/tests/test-rebase-named-branches.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-rebase-named-branches.t Mon Oct 12 12:44:18 2020 -0700 @@ -392,7 +392,7 @@ $ hg rebase -s 5 -d 4 --dry-run starting dry-run rebase; repository will not be changed abort: uncommitted changes - [255] + [20] $ hg diff diff -r 2b586e70108d A --- a/A Thu Jan 01 00:00:00 1970 +0000 @@ -406,7 +406,7 @@ $ echo n | hg rebase -s 5 -d 4 --confirm --config ui.interactive=True starting in-memory rebase abort: uncommitted changes - [255] + [20] $ hg diff diff -r 2b586e70108d A --- a/A Thu Jan 01 00:00:00 1970 +0000 @@ -417,7 +417,7 @@ $ hg rebase -s 5 -d 4 --confirm starting in-memory rebase abort: uncommitted changes - [255] + [20] $ hg diff diff -r 2b586e70108d A --- a/A Thu Jan 01 00:00:00 1970 +0000