Mercurial > hg
diff tests/test-strip.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 | 2bc978921e8a |
children | d7a508a75d72 |
line wrap: on
line diff
--- a/tests/test-strip.t Thu Oct 22 13:31:34 2020 -0700 +++ b/tests/test-strip.t Mon Oct 12 12:44:18 2020 -0700 @@ -317,7 +317,7 @@ $ hg strip 4 abort: outstanding uncommitted merge (use 'hg commit' or 'hg merge --abort') - [255] + [20] ##strip allowed --force with merge in progress $ hg strip 4 --force 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -606,7 +606,7 @@ $ echo c > b $ hg strip tip abort: uncommitted changes - [255] + [20] $ hg strip tip --keep saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) $ hg log --graph @@ -758,7 +758,7 @@ $ hg add a $ hg strip -B B abort: uncommitted changes - [255] + [20] $ hg bookmarks * B 6:ff43616e5d0f