Page MenuHomePhabricator

copies: distinguish between merged and touched files during upgrade
ClosedPublic

Authored by marmoute on Mar 15 2021, 10:19 AM.

Details

Summary

This a filenode being different between p1, p2 and result does not necessarily
means a merges happens. For example p2 could be a strict newer version of p1, so
the p2 version is picked by the manifest merging, but then the file is manually
updated before the commit.

In this case the file should be detected as touched.

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

marmoute created this revision.Mar 15 2021, 10:19 AM
baymax retitled this revision from copies: distinct between merged and touched files during upgrade to copies: distinguish between merged and touched files during upgrade.Mar 15 2021, 2:11 PM
baymax updated this revision to Diff 26369.

โœ… refresh by Heptapod after a successful CI run (๐Ÿ™ ๐Ÿ’š)

pulkit updated this revision to Diff 26520.Mar 19 2021, 4:37 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.