[svnbook] r4159 committed - Follow-up to r4158: Give fair warning of the *actual* problem!...

svnbook at googlecode.com svnbook at googlecode.com
Fri Nov 4 16:04:13 CDT 2011

Revision: 4159
Author:   ptburba at gmail.com
Date:     Fri Nov  4 14:03:07 2011
Log:      Follow-up to r4158: Give fair warning of the *actual* problem!

* 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.



--- /trunk/en/book/ch04-branching-and-merging.xml	Fri Nov  4 13:36:40 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Fri Nov  4 14:03:07 2011
@@ -980,10 +980,10 @@
          of that.  Because of this narrow focus, in addition to
          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,
+        <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,
          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