This is an archive of the discontinued Mercurial Phabricator instance.

amend: don't remove unselected removals from memctx
ClosedPublic

Authored by martinvonz on Apr 19 2022, 12:26 AM.

Details

Summary

When there are removed files in the working copy and they are not
selected to be amended into the parent, the filectxfn we create for
the memctx would still return None before this patch. That's
clearly incorrect; we should return the filectx from the unamended
commit. Somehow it seems to not matter much except for the case with
copies stored in changesets.

Thanks to Kyle Lippincott for doing all the debugging and identifying
the fix for this issue.

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.