( )⚙ D12087 unamend: error out when running on merge commit

This is an archive of the discontinued Mercurial Phabricator instance.

unamend: error out when running on merge commit
ClosedPublic

Authored by martinvonz on Jan 25 2022, 12:17 AM.

Details

Summary

It's better to error out than to produce a bad commit. We do that same
in hg uncommit. I haven't looked into how much work it is to make
them work instead.

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.Jan 25 2022, 12:17 AM
Alphare accepted this revision.Jan 25 2022, 4:49 AM
Alphare added a subscriber: Alphare.

Agreed that this is strictly better. I'll queue both for stable

This revision is now accepted and ready to land.Jan 25 2022, 4:49 AM
This revision was automatically updated to reflect the committed changes.