--- a/debian/rules	Mon May 21 16:25:29 2018 +0200
+++ b/debian/rules	Mon May 21 16:56:52 2018 +0200
@@ -30,3 +30,4 @@
 	rm -rf html
 	rm -f docs/static/logo-evolve.ico
 	rm -f docs/tutorials/tutorial.rst
+	rm -f docs/tutorials/topic-tutorial.rst

--- a/hgext3rd/evolve/__init__.py	Mon May 21 16:25:29 2018 +0200
+++ b/hgext3rd/evolve/__init__.py	Mon May 21 16:56:52 2018 +0200
@@ -1352,7 +1352,7 @@
 @eh.uisetup
 def setupevolveunfinished(ui):
     data = ('evolvestate', False, False, _('evolve in progress'),
-            _("use 'hg evolve --continue' or 'hg update -C .' to abort"))
+            _("use 'hg evolve --continue' or 'hg evolve --abort' to abort"))
     cmdutil.unfinishedstates.append(data)
 
     afterresolved = ('evolvestate', _('hg evolve --continue'))

--- a/hgext3rd/evolve/cmdrewrite.py	Mon May 21 16:25:29 2018 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py	Mon May 21 16:56:52 2018 +0200
@@ -140,15 +140,11 @@
         opts['amend'] = True
         _resolveoptions(ui, opts)
         _alias, commitcmd = cmdutil.findcmd('commit', commands.table)
-        try:
-            wlock = repo.wlock()
-            lock = repo.lock()
+        with repo.wlock(), repo.lock():
             if not (edit or opts['message'] or log):
                 opts['message'] = repo['.'].description()
             rewriteutil.precheck(repo, [repo['.'].rev()], action='amend')
             return commitcmd[0](ui, repo, *pats, **opts)
-        finally:
-            lockmod.release(lock, wlock)
 
 def amendpatch(ui, repo, *pats, **opts):
     """logic for --patch flag of `hg amend` command."""