https://bz.mercurial-scm.org/show_bug.cgi?id=5564
Bug ID: 5564 Summary: The execution bit is lost when merging conflicts with an external merge tool Product: Mercurial Version: stable branch Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: fgiovana...@aragnet.com CC: mercurial-devel@mercurial-scm.org When a merge or a rebase find a conflict on a executable file the execution bit gets lost when the file gets merged by an external tool ( kdiff3 ). To reproduce make a conflicting change ( even an automatically resolvable one) on an executable file, then: hg rebase -r 181 -d 183 --keep will preserve the executable bit, but hg rebase -r 181 -d 183 --keep -t kdiff3 won't preserve it. Note that the conflict gets automatically resolved by both tools, so no window is created. I'm filing a feature request because the bug is neither a mercurial issue neither a kdiff3 one ( I know that it preserve the bit) but mainly an integration issue. Regards. Federico -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel