Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: correct action verb in a message
authorAnton Shestakov <av6@dwimlabs.net>
Sat, 08 Jun 2019 16:09:37 +0800
changeset 4678 36c2bac8cab3
parent 4677 b734a0085fe2
child 4679 d9016946ec69
evolve: correct action verb in a message
CHANGELOG file | annotate | diff | comparison | revisions
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions
tests/test-evolve-abort-orphan.t file | annotate | diff | comparison | revisions 
--- 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
evolve