diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3171,7 +3171,9 @@
             newid = repo.commitctx(new)
         finally:
             repo.ui.setconfig('phases', 'new-commit', ph, 'amend')
-        if newid != old.node():
+
+        # TODO: remove if block and fix indentation
+        if True:
             # Reroute the working copy parent to the new changeset
             repo.setparents(newid, nullid)
             mapping = {old.node(): (newid,)}