[svnbook] r4158 committed - * en/book/ch04-branching-and-merging.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Fri Nov 4 15:37:54 CDT 2011
Revision: 4158
Author: ptburba at gmail.com
Date: Fri Nov 4 13:36:40 2011
Log: * en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.reintegrate): Footnote more 1.7's
more permissive attitude towards shallow targets, but give fair
warning of potential problems.
http://code.google.com/p/svnbook/source/detail?r=4158
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Fri Nov 4 13:08:56 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Fri Nov 4 13:36:40 2011
@@ -978,7 +978,12 @@
nature of most Subversion subcommand options. It supports the
use case described above, but has little applicability outside
of that. Because of this narrow focus, in addition to
- requiring an up-to-date working copy with no mixed-revisions,
+ requiring an up-to-date working copy<footnote><para>Reintegrate
+ merges are allowed if the target is a shallow checkout (see
+ <xref linkend="svn.advanced.sparsedirs"/>) but you will see tree
+ conflicts if the diff to be applied effects paths that are
+ <quote>missing</quote> due to the sparse working copy.</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