[svnbook] r4383 committed - Merge r4382 from ^/trunk/en (binary files and 'svn diff/annotate').
svnbook at googlecode.com
svnbook at googlecode.com
Thu Jan 31 15:23:08 CST 2013
Revision: 4383
Author: cmpilato at gmail.com
Date: Thu Jan 31 13:22:49 2013
Log: Merge r4382 from ^/trunk/en (binary files and 'svn
diff/annotate').
http://code.google.com/p/svnbook/source/detail?r=4383
Modified:
/branches/1.7/en
/branches/1.7/en/book/ch03-advanced-topics.xml
=======================================
--- /branches/1.7/en/book/ch03-advanced-topics.xml Tue Jan 29 10:25:41 2013
+++ /branches/1.7/en/book/ch03-advanced-topics.xml Thu Jan 31 13:22:49 2013
@@ -1535,6 +1535,22 @@
attempts at performing contextual merges on files that simply
cannot be contextually merged.</para>
+ <para>Additionally, since the acts of displaying line-based
+ differences and line-based change attribution are, rather
+ obviously, dependent on there being a meaningful definition
+ of <quote>line</quote> for a given file, files with nontextual
+ MIME types will by default trigger errors when used as the
+ targets of <command>svn diff</command> and <command>svn
+ annotate</command> operations. This can be especially
+ frustrating for users with XML files whose
+ <literal>svn:mime-type</literal> property is set to something
+ such as <literal>application/xml</literal> which is not
+ unambiguously human-readable and as such is treated as
+ nontextual by Subversion. Fortunately, those subcommands
+ offer a <option>--force</option> option for forcing
+ Subversion to attempt the operations in spite of the apparent
+ non-human-readability of the files.</para>
+
<warning>
<para>The <literal>svn:mime-type</literal> property, when set
to a value that does not indicate textual file contents, can
More information about the svnbook-dev
mailing list