This is an archive of the discontinued Mercurial Phabricator instance.

commit: reorder if-else conditional to give mergestate info priority

Authored by pulkit on Mar 5 2021, 12:30 PM.



Looking at the code now, I was unable to find a good reason as why we only rely
on mergestate extras info after checking whether a filelog parent is ancestor of
other or not.

I mean if we have stored in mergestate that other was chosed, we should
blindly pick that one.

This cleanup will also help introduce more cases when both fparent1 and
fparent2 are non-null but using info from mergestate, we can fastpath.

Diff Detail

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

Event Timeline

pulkit created this revision.Mar 5 2021, 12:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.