[svnbook] r4163 committed - * en/book/ch04-branching-and-merging.xml...

[svnbook at googlecode.com]

Revision: 4163
Author:   ptburba at gmail.com
Date:     Mon Nov  7 07:41:56 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchemerge.basicmerging.stayinsync): Add a tip regarding
    1.7's new subtree mergeinfo recording behavior.

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

Modified:
  /trunk/en/book/ch04-branching-and-merging.xml

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Fri Nov  4 14:03:07 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Mon Nov  7 07:41:56 2011
@@ -856,6 +856,26 @@

        </sidebar>

+      <tip>
+        <para>Prior to Subversion 1.7, merges unconditionally updated
+          <emphasis>all</emphasis> of the subtree mergeinfo under the
+          target to describe the merge. For users with a lot of subtree
+          mergeinfo this meant that relatively <quote>simple</quote>
+          merges (e.g. one which applied a diff to only a single file)
+          resulted in changes to every subtree with mergeinfo, even
+          those that were not parents of the effected path(s). This
+          caused some level of confusion and frustration. Subversion 1.7
+          addresses this problem by only updating the mergeinfo on
+          subtrees which are parents of the paths modified by the merge
+          (i.e. paths changed, added, or deleted by application of the
+          difference, see
+          <xref linkend="svn.branchmerge.advanced.advancedsyntax"/>).
+          The one exception to this behavior regards the actual merge
+          target; the merge target's mergeinfo is always updated to
+          describe the merge, even if the applied difference made no
+          changes.</para>
+      </tip>
+
      </sect2>

      <!-- ===============================================================  
-->