[svnbook] r4202 committed - * en/book/ch01-fundamental-concepts.xml...

[svnbook at googlecode.com]

Revision: 4202
Author:   cmpilato at gmail.com
Date:     Fri Nov 11 09:08:31 2011
Log:      * en/book/ch01-fundamental-concepts.xml
   Complete a TODO item I'd overlooked -- another limitation of
   mixed-revision working copies.

http://code.google.com/p/svnbook/source/detail?r=4202

Modified:
  /trunk/en/book/ch01-fundamental-concepts.xml

=======================================
--- /trunk/en/book/ch01-fundamental-concepts.xml	Fri Oct 21 11:28:14 2011
+++ /trunk/en/book/ch01-fundamental-concepts.xml	Fri Nov 11 09:08:31 2011
@@ -1121,8 +1121,10 @@
              committing a property change to an out-of-date directory may
              destroy properties you've not yet seen.</para>

-           <!-- ### TODO: In Subversion 1.7, you cannot merge into a
-                ### mixed-rev working copy by default -->
+          <para>Finally, beginning in Subversion 1.7, you cannot by
+            default use a mixed-revision working copy as the target of
+            a merge operation.  (This new requirement was introduced
+            to prevent common problems which stem from doing so.)</para>

          </sect4>
        </sect3>