--- a/mercurial/cmdutil.py Thu Jan 07 20:02:47 2016 -0800
+++ b/mercurial/cmdutil.py Wed Nov 11 21:18:02 2015 -0500
@@ -2530,13 +2530,14 @@
# First, do a regular commit to record all changes in the working
# directory (if there are any)
ui.callhooks = False
- activebookmark = repo._activebookmark
+ activebookmark = repo._bookmarks.active
try:
- repo._activebookmark = None
+ repo._bookmarks.active = None
opts['message'] = 'temporary amend commit for %s' % old
node = commit(ui, repo, commitfunc, pats, opts)
finally:
- repo._activebookmark = activebookmark
+ repo._bookmarks.active = activebookmark
+ repo._bookmarks.recordchange(tr)
ui.callhooks = True
ctx = repo[node]