Mercurial > evolve
changeset 4678:36c2bac8cab3
evolve: correct action verb in a message
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 08 Jun 2019 16:09:37 +0800 |
| parents | b734a0085fe2 |
| children | d9016946ec69 |
| files | CHANGELOG hgext3rd/evolve/evolvecmd.py tests/test-evolve-abort-orphan.t |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Sat Jun 08 16:06:24 2019 +0800 +++ b/CHANGELOG Sat Jun 08 16:09:37 2019 +0800 @@ -5,6 +5,7 @@ ------------------- * evolve: use the same wording as core in case of unresolved conflict + * evolve: minor output message improvements 9.0.0 -- 2019-06-06 -------------------
--- a/hgext3rd/evolve/evolvecmd.py Sat Jun 08 16:06:24 2019 +0800 +++ b/hgext3rd/evolve/evolvecmd.py Sat Jun 08 16:09:37 2019 +0800 @@ -1667,7 +1667,7 @@ return elif abortopt: if not evolvestate: - raise error.Abort(_('no interrupted evolve to stop')) + raise error.Abort(_('no interrupted evolve to abort')) evolvestate.load() # `hg next --evolve` in play if evolvestate['command'] != 'evolve':
--- a/tests/test-evolve-abort-orphan.t Sat Jun 08 16:06:24 2019 +0800 +++ b/tests/test-evolve-abort-orphan.t Sat Jun 08 16:09:37 2019 +0800 @@ -42,7 +42,7 @@ ============================================= $ hg evolve --abort - abort: no interrupted evolve to stop + abort: no interrupted evolve to abort [255] Testing with wrong combination of flags