Page MenuHomePhabricator

flags: actually merge flags in simplemerge
ClosedPublic

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

Details

Summary

Since b86fc43e4b73, the local flag were blindly taken. This resulted in bug when
rename are involved. exec flag change are now properly merged (when merged from
the rename side).

Another bug is affecting this when merging from the side without the rename.

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.Sat, May 16, 4:11 PM
durin42 accepted this revision.Mon, May 18, 1:01 PM
This revision is now accepted and ready to land.Mon, May 18, 1:01 PM
This revision was automatically updated to reflect the committed changes.