merging executable binaries

Hello,

I have seen the following behaviour.

added binary file to SVN with property svn:executable
executable bits are then set on the file
checked in the file
added a branch which included the file
modified the file in TRUNK
merged the change to branch
the executable flag on the file is then gone
however when I commit the merge the executable flag of the file is again
being set

Is this the correct behaviour (is the executable flag supposed to be
missing after a merge - and then added when the file is actually
committed)?

The behaviour is different for non binary executables (the executable
bits are always set in this case).

The SVN version I used was 1.6.6 on Ubuntu 10.0.4. The filesystem on
which the working copy resides is EXT4.

I hope someone can clear this up for me.

Thanks,
Matthias
Received on 2010-07-05 14:59:40 CEST