This is an archive of the discontinued Mercurial Phabricator instance.

flags: account for flag change when tracking rename relevant to merge
ClosedPublic

Authored by marmoute on May 16 2020, 4:11 PM.

Details

Summary

There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.

There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.

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.