diff -r 5e111215e38b -r d6e7ac651973 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Thu May 14 21:34:46 2015 -0700
+++ b/mercurial/cmdutil.py	Tue Apr 14 12:53:48 2015 -0700
@@ -2489,13 +2489,13 @@
             # First, do a regular commit to record all changes in the working
             # directory (if there are any)
             ui.callhooks = False
-            currentbookmark = repo._activebookmark
+            activebookmark = repo._activebookmark
             try:
                 repo._activebookmark = None
                 opts['message'] = 'temporary amend commit for %s' % old
                 node = commit(ui, repo, commitfunc, pats, opts)
             finally:
-                repo._activebookmark = currentbookmark
+                repo._activebookmark = activebookmark
                 ui.callhooks = True
             ctx = repo[node]