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

[svnbook at googlecode.com]

Revision: 3701
Author: stsp at elego.de
Date: Thu Feb 18 10:12:26 2010
Log: * src/en/book/ch04-branching-and-merging.xml
   (svn.branchemerge.basicmerging.reintegrate): Link to
    svn.branchmerge.advanced.reintegratetwice from here, to ensure
    awareness of the alternative to deleting a reintegrated branch.

Suggested by: Jacob Weber

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

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

=======================================
--- /trunk/src/en/book/ch04-branching-and-merging.xml	Wed Feb 17 05:05:48  
2010
+++ /trunk/src/en/book/ch04-branching-and-merging.xml	Thu Feb 18 10:12:26  
2010
@@ -834,6 +834,10 @@
          copy to reflect a different repository directory.  We'll discuss
          this more in <xref linkend="svn.branchmerge.switchwc"/>.</para>

+      <para>There is another way of making the branch usable again
+        after reintegration, without deleting the branch. See
+        <xref linkend="svn.branchmerge.advanced.reintegratetwice"/>.</para>
+
      </sect2>

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