This is an archive of the discontinued Mercurial Phabricator instance.

merge: do the trivial resolution after updating sparse checkout
ClosedPublic

Authored by pulkit on Jul 27 2018, 8:38 AM.

Details

Summary

In merge, we do trivial resolution for files which were deleted on one side and
changed on other. When sparse extension in involved that file might not be
present in wdir and trivial resolution can lead to file not found error. This
patch make sure we updates the sparse checkout before doing the trivial
resolution.

This fixes the test failure demonstrated in previous patch.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jul 27 2018, 8:38 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jul 31 2018, 9:25 AM

I didn't come up with an example where d/c or c/d conflicts resolved by
_resolvetrivial() had to be fixed up by _forgetremoved().

Queued for stable, thanks.