[svnbook] r4246 committed - Break run-on sentence...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Jan 17 22:03:06 CST 2012
Revision: 4246
Author: richardcavell at mail.com
Date: Tue Jan 17 20:02:28 2012
Log: Break run-on sentence
In footnote, replace comma with mdash
http://code.google.com/p/svnbook/source/detail?r=4246
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Tue Nov 22 00:39:35 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Tue Jan 17 20:02:28 2012
@@ -1114,8 +1114,9 @@
merges are allowed if the target is a shallow checkout (see
<xref linkend="svn.advanced.sparsedirs"/>) but any paths affected
by the diff which are <quote>missing</quote> due to the sparse
- working copy will be skipped, probably <emphasis>not</emphasis>
- what you intended!</para></footnote> with no mixed-revisions,
+ working copy will be skipped—this is
+ probably <emphasis>not</emphasis> what you
intended!</para></footnote>
+ with no mixed-revisions,
it will not function in combination with most of the other
<command>svn merge</command> options. You'll get an error if you
use any non-global options but these: <option>--accept</option>,
More information about the svnbook-dev
mailing list