[svnbook] r5093 committed - trunk/en/book/ch07-customizing-svn.xml

[cmpilato at users.sourceforge.net]

Revision: 5093
          http://sourceforge.net/p/svnbook/source/5093
Author:   cmpilato
Date:     2016-02-03 18:51:29 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
Finish #194 ("Fix about the use of external diff tools: 'svn diff
--force' allows it!").

* en/book/ch07-customizing-svn.xml
  (svn.advanced.externaldifftools): Note that 'svn diff --force' will
    perform a real diff even if MIME types indicate that it shouldn't.

Modified Paths:
--------------
    trunk/en/book/ch07-customizing-svn.xml

Modified: trunk/en/book/ch07-customizing-svn.xml
===================================================================
--- trunk/en/book/ch07-customizing-svn.xml	2016-02-03 18:42:18 UTC (rev 5092)
+++ trunk/en/book/ch07-customizing-svn.xml	2016-02-03 18:51:29 UTC (rev 5093)
@@ -1334,19 +1334,22 @@
       things get unintuitive for most users.</para>
 
     <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>
+      <para>The decision on when to fire off a contextual two- or
+        three-way diff as part of a larger Subversion operation is
+        made internally 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 typically not be invoked by Subversion
+        if your versioned Word documents had a configured MIME type
+        that denoted that they were not human-readable (such as
+        <literal>application/msword</literal>).  Fortunately, you can
+        pass the <option>--force</option> option to <command>svn
+        diff</command> to short-circuit this MIME-related sanity check
+        and force the difference to be calculated.  For more about
+        MIME type settings, see
+        <xref linkend="svn.advanced.props.special.mime-type"/></para>
     </note>
 
     <para>Much later, Subversion 1.5 introduced interactive resolution