Re: Why does a merge Replace my files instead of merging them?

Simon Lucy schreef:
> Hendrik Maryns wrote:
>> Hi,
>>
>> As regulars here might have noticed, I’m having a hard time merging. I
>> think I got it to work now, but one thing annoys me: Subversion replaces
>> some files instead of merging them. Indeed the merge output gives:
>>
> Are you sure you have mime types for .java files? If subversion thinks
> they're binary they'll always get replaced rather than merged.

It wasn’t the mime type, but rather svn:executable was set for no
particular reason. I removed that property, hoping that will help in
the future.

Thanks, H.

-- 
Hendrik Maryns
http://tcl.sfs.uni-tuebingen.de/~hendrik/
==================
Ask smart questions, get good answers:
http://www.catb.org/~esr/faqs/smart-questions.html
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979701
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].