[Bug 4170] New: merge produces spurious mode changes

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4170

          Priority: normal
            Bug ID: 4170
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: merge produces spurious mode changes
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: sphink at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: unspecified
         Component: Mercurial
           Product: Mercurial

http://hg.mozilla.org/build/mozharness/ has two branches, 'default' and
'production'.

I had a couple of patches on 'default' that I merged to 'production'. The merge
commit changed the mode of one of the modified files from 755 to 644, even
though the mode of the file in both parents is 755.

Details for the above repo:

file: scripts/spidermonkey_build.py
parent1: a7dd39e69b16 (mode 100755)
parent2: bad0aa60db7a (mode 100755)

I did a merge by running

hg update -r production
hg merge default
hg commit -m 'merge to production'

The resulting merge commit 12453b8563f7 changed the mode to 100644.

hg --version says 2.8.1+3-1ddf4409229f

-- 
You are receiving this mail because:
You are on the CC list for the bug.