[svnbook] r4203 committed - Merge from ^/trunk/en r4202.

svnbook at googlecode.com svnbook at googlecode.com
Fri Nov 11 11:16:03 CST 2011


Revision: 4203
Author:   cmpilato at gmail.com
Date:     Fri Nov 11 09:09:59 2011
Log:      Merge from ^/trunk/en r4202.
http://code.google.com/p/svnbook/source/detail?r=4203

Modified:
  /branches/1.7/en
  /branches/1.7/en/book/ch01-fundamental-concepts.xml

=======================================
--- /branches/1.7/en/book/ch01-fundamental-concepts.xml	Fri Oct 21 11:28:14  
2011
+++ /branches/1.7/en/book/ch01-fundamental-concepts.xml	Fri Nov 11 09:09:59  
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>




More information about the svnbook-dev mailing list