diff -r d19c9bdbbf35 -r 49f2d5644f04 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Wed Mar 19 02:45:14 2014 +0100 +++ b/mercurial/cmdutil.py Wed Mar 19 02:45:14 2014 +0100 @@ -1982,10 +1982,10 @@ commitphase = 'secret' else: commitphase = old.phase() - repo.ui.setconfig('phases', 'new-commit', commitphase) + repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') newid = repo.commitctx(new) finally: - repo.ui.setconfig('phases', 'new-commit', ph) + repo.ui.setconfig('phases', 'new-commit', ph, 'amend') if newid != old.node(): # Reroute the working copy parent to the new changeset repo.setparents(newid, nullid)