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

[svnbook at googlecode.com]

Revision: 4176
Author:   ptburba at gmail.com
Date:     Tue Nov  8 08:45:46 2011
Log:      * en/book/ch04-branching-and-merging.xml

   (svn.branchmerge.nomergedata.impicit.mergeinfo): New id
    attribute for the 'Natural History and Implicit Mergeinfo'
    sidebar.

   (svn.branchmerge.advanced.reintegratetwice): A few minor
    wording changes and a link to the 'Natural History and
    Implicit Mergeinfo' sidebar when we use the former term.


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

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  8 08:29:25 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  8 08:45:46 2011
@@ -2007,7 +2007,7 @@
                   "mergeinfo" to help defined "natural history", but
                   we've not really defined "mergeinfo" either.  -->

-      <sidebar>
+      <sidebar id="svn.branchmerge.nomergedata.impicit.mergeinfo">
          <title>Natural History and Implicit Mergeinfo</title>

          <para>As we mentioned earlier when discussing
@@ -2353,7 +2353,7 @@
        <para>Let's assume you created your branch in revision
          <emphasis>A</emphasis>. While working on your branch, you created
          one or more revisions which made changes to the branch.
-        Before reintegrating your branch into trunk, you made a final
+        Before reintegrating your branch back to trunk, you made a final
          merge from trunk to your branch, and committed the result of
          this merge as revision <emphasis>B</emphasis>.</para>

@@ -2365,7 +2365,7 @@

        <para>If you now try to merge outstanding changes from trunk to your
          branch, Subversion will consider changes made in revision
-        <emphasis>X</emphasis> as eligible for being merged into the
+        <emphasis>X</emphasis> as eligible for merging into the
          branch. However, since your branch already contains all the
          changes made in revision <emphasis>X</emphasis>, merging these
          changes can result in spurious conflicts! These conflicts are
@@ -2415,7 +2415,9 @@
        <para>It should now also be apparent why deleting the branch and
          re-creating it has the same effect as doing the above record-only
          merge. Because revision <emphasis>X</emphasis> is part of the  
natural
-        history of the newly created branch, Subversion will never attempt  
to
+        history (see the sidebar
+        <xref linkend="svn.branchmerge.nomergedata.impicit.mergeinfo"/>)
+        of the newly created branch, Subversion will never attempt to
          merge revision <emphasis>X</emphasis> into the branch, avoiding
          spurious conflicts.</para>