--- a/mercurial/cmdutil.py	Tue Jun 30 19:19:17 2015 -0400
+++ b/mercurial/cmdutil.py	Tue Jun 30 22:28:40 2015 -0700
@@ -2454,6 +2454,7 @@
 
     ui.note(_('amending changeset %s\n') % old)
     base = old.p1()
+    createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
 
     wlock = dsguard = lock = newid = None
     try:
@@ -2619,7 +2620,6 @@
                         marks[bm] = newid
                     marks.recordchange(tr)
             #commit the whole amend process
-            createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
             if createmarkers and newid != old.node():
                 # mark the new changeset as successor of the rewritten one
                 new = repo[newid]