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

>>>>> "Hendrik" == Hendrik Maryns <qwizv9b02_at_sneakemail.com> writes:

 Hendrik> 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.

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

That should not be the reason -- it's perfectly normal to have
executable text files. (Scripts)

           paul

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980264

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-08 09:06:08 CET