Mercurial > hg
comparison tests/test-mq.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 | 1474f5d84662 |
children | 95c4cca641f6 |
comparison
equal
deleted
inserted
replaced
45839:ebee234d952a | 45840:527ce85c2e60 |
---|---|
810 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 810 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
811 $ echo y>y | 811 $ echo y>y |
812 $ hg add y | 812 $ hg add y |
813 $ hg strip tip | 813 $ hg strip tip |
814 abort: uncommitted changes | 814 abort: uncommitted changes |
815 [255] | 815 [20] |
816 | 816 |
817 --force strip with local changes | 817 --force strip with local changes |
818 | 818 |
819 $ hg strip -f tip | 819 $ hg strip -f tip |
820 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 820 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |