svn:executable not applied at merge

We've recently moved to subversion from CVS and started using
branches, which is working very well. However I think have come across
a 'gotcha'/bug that could do with being fixed.

I was developing on a branch, and one of the files I was working with
was a shell script, which had imported from CVS without an executable
flag, so my code didn't work. No problem, I'll just set the
svn:executable property on the file. This I did (as well as chmod the
file also) and my code worked fine again.

Then I merged from branch to trunk, used svn status to obtain a
rollout file list, and created a tarball. The script was included in
this list as it appeared in the svn status tarball as well. I did not
commit the merge as procedure here is to not do that until the rollout
has been tested.

So, I rolled out the tarball and things broke. After much digging, I
found that it was because the script did not have executable
permissions. It appears that when merging a file for which
svn:executable is one of the changes, the executable flag is not
actually set on the file at that time.

I've asked a few colleagues for opinions, and the general consensus is
that the merge should have set the permission when it merged the
svn:executable property. I can't see a reason why this shouldn't be
the case.

Any comments/thoughts?

-- 
Russ
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org