[svnbook] r4455 committed - Fix Issue #188: Local svn copy to branch results in tree conflicts....

svnbook at googlecode.com svnbook at googlecode.com
Mon Mar 11 16:51:45 CDT 2013

Revision: 4455
Author:   ptburba
Date:     Mon Mar 11 14:51:40 2013
Log:      Fix Issue #188: Local svn copy to branch results in tree  

* en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.using.create): Add a slightly more dire warning
    against creating branches with WC-to-WC copies.



--- /trunk/en/book/ch04-branching-and-merging.xml	Mon Mar 11 10:04:42 2013
+++ /trunk/en/book/ch04-branching-and-merging.xml	Mon Mar 11 14:51:40 2013
@@ -216,8 +216,13 @@
          every file and subdirectory within that working copy directory
          on the local disk.  Copying a directory on the server,
          however, is a constant-time operation, and it's the way most
-        people create branches.</para>
+        people create branches.  In addition, this practice raises the
+        possibility of copying mixed-revision working copies.  This isn't
+        inherently dangerous, but can cause unnecessary complications later
+        during merging.  If you do choose to create a branch by copying a
+        working copy path, you should be sure the source directory has no
+        local modifications and is not at mixed-revisions.</para>
        <figure id="svn.branchmerge.using.create.dia-1">
          <title>Repository with new copy</title>
          <graphic fileref="images/ch04dia3.png"/>

More information about the svnbook-dev mailing list