This is an archive of the discontinued Mercurial Phabricator instance.

merge: show number of ancestors in bid merge debug notes
ClosedPublic

Authored by pulkit on Aug 27 2020, 5:39 AM.

Details

Summary

A good number of times, we don't generate an action for a file in
manifestmerge() which can result in bid merge doing the wrong thing.

Mentioning the number of ancestors from which we are bidding will help spot such
cases where we are not returning an action.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Aug 27 2020, 5:39 AM
pulkit updated this revision to Diff 22502.Sep 1 2020, 8:15 AM
marmoute accepted this revision.Sep 11 2020, 8:51 AM
marmoute added a subscriber: marmoute.

This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.