diff -r d09de637cbc8 -r a3acacbd0ff3 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Sat Jul 15 23:46:33 2017 -0400
+++ b/mercurial/cmdutil.py	Mon Jul 10 17:48:33 2017 +0200
@@ -2750,7 +2750,7 @@
     base = old.p1()
 
     newid = None
-    with repo.wlock(), repo.lock(), repo.transaction('amend') as tr:
+    with repo.wlock(), repo.lock(), repo.transaction('amend'):
         # See if we got a message from -m or -l, if not, open the editor
         # with the message of the changeset to amend
         message = logmessage(ui, opts)
@@ -2768,7 +2768,6 @@
             node = commit(ui, repo, commitfunc, pats, opts)
         finally:
             repo._bookmarks.active = activebookmark
-            repo._bookmarks.recordchange(tr)
             ui.callhooks = True
         ctx = repo[node]