Page MenuHomePhabricator

commit: clear mergestate also with --amend (issue6304)
ClosedPublic

Authored by martinvonz on Aug 18 2020, 6:37 PM.

Details

Summary

The hg commit --amend uses the in-memory code, which naturally
doesn't touch the merge state (well, it shouldn't anyway; I think I've
fixed bugs in that area recently). We therefore need to clear the
mergestate after calling repo.commitctx() since we expect that from
hg commit --amend.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Aug 18 2020, 6:37 PM
pulkit accepted this revision.Aug 24 2020, 3:34 AM
This revision is now accepted and ready to land.Aug 24 2020, 3:34 AM