--- a/hgext3rd/evolve/evolvecmd.py	Wed May 30 00:34:35 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Sun May 27 02:32:58 2018 +0530
@@ -1231,6 +1231,14 @@
         if not evolvestate:
             raise error.Abort(_('no interrupted evolve to stop'))
         evolvestate.load()
+        # `hg next --evolve` in play
+        if evolvestate['command'] != 'evolve':
+            pctx = repo['.']
+            hg.updaterepo(repo, pctx.node(), True)
+            ui.status(_('evolve aborted\n'))
+            ui.status(_('working directory is now at %s\n')
+                      % pctx.hex()[:12])
+            return 0
         return abortevolve(ui, repo, evolvestate)
     else:
         cmdutil.bailifchanged(repo)