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

Op 05-12-08 20:05 heeft Paul Koning als volgt van zich laten horen:
>>>>>> "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)

I agree with ‘should not’, but it seems like it was, since there was
nothing else peculiar about those files. In particular, svn:mime-type
was not set, nor was any other property.

So is this a bug I should report? I will try and see whether it works
correctly now.

Cheers, H.

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