I wonder if this would help (from the PDF):
To determine whether a contextual merge is possible, Subversion
examines the
svn:mime-type property. If the file has no svn:mime-type property, or
has a mime-type
that is textual (e.g. text/*), Subversion assumes it is text.
Otherwise, Subversion assumes
the file is binary. Subversion also helps users by running a binary-
detection algorithm in the
svn import and svn add commands. These commands will make a good guess
and then
(possibly) set a binary svn:mime-type property on the file being
added. (If Subversion
guesses wrong, the user can always remove or hand-edit the property.)
/TOMMY
On Dec 10, 2007, at 12:02 PM, Gus Hart wrote:
> This is my first post to the list.
>
> I find it incredible that such a thing as automatic merging even
> exists. SVN is writing code for you! Be that as it may, how can I
> prevent automatic merging?
>
> I hunted around for this topic on the web and found someone's
> suggestion to add the following to the ~/.subversion/config file:
> diff-cmd=/usr/bin/false
> diff3-cmd=/usr/bin/false
>
> but alas this doesn't work. I still get the dreaded "G" tag when
> updating. I have a feeling that somehow the config file is being
> ignored as changing the "editor-cmd" value didn't change anything
> either...
>
> Please help if you can. Thanks!
> -GH
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
Received on Mon Dec 10 21:20:16 2007