( )⚙ D8715 mergestate: rename addpath() -> addpathonflict() to prevent confusion

This is an archive of the discontinued Mercurial Phabricator instance.

mergestate: rename addpath() -> addpathonflict() to prevent confusion
ClosedPublic

Authored by pulkit on Jul 9 2020, 8:36 AM.

Details

Summary

addpath() seems to imply that we are adding a new path/entry to the mergestate.

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

pulkit created this revision.Jul 9 2020, 8:36 AM
pulkit updated this revision to Diff 21886.Jul 14 2020, 8:29 AM
This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.