Originally created by: cmpilato
Originally owned by: cmpilato
In chapter 7, we find this note:
{{{
<note>
<para>The decision on when to fire off a contextual two- or three-way
diff as part of a larger Subversion operation is made entirely
by Subversion and is affected by, among other things, whether
the files being operated on are human-readable as
determined by their <literal>svn:mime-type</literal> property.
This means, for example, that even if you had the niftiest
Microsoft Word-aware differencing or merging tool in the
universe, it would never be invoked by Subversion as long as
your versioned Word documents had a configured MIME type that
denoted that they were not human-readable (such as
<literal>application/msword</literal>). For more about MIME
type settings, see <xref
linkend="svn.advanced.props.special.mime-type"/></para>
</note>
}}}
What is *not* noted is that the --force option to 'svn diff' will override and short-circuit this mime-type detection logic!
Diff:
Fixed in r5093.