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

[svnbook at googlecode.com]

Revision: 4180
Author:   ptburba at gmail.com
Date:     Tue Nov  8 11:01:55 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.advanced.pre1.5clients): Some minor wording
    changes and a link to the 'merge tracking' sidebar.


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

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  8 09:45:15 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Tue Nov  8 11:01:55 2011
@@ -2724,9 +2724,11 @@
        <title>Blocking Merge-Unaware Clients</title>

        <para>If you've just upgraded your server to Subversion 1.5 or
-        later, there's a significant risk that pre-1.5 Subversion
-        clients can mess up your automated merge tracking.  Why is
-        this?  When a pre-1.5 Subversion client performs <command>svn
+        later, there's a risk that pre-1.5 Subversion
+        clients can cause problems with
+        <xref linkend="svn.branchmerge.basicmerging.mergetracking"/>.
+        This is because pre-1.5 clients don't support this feature;
+        when one of these older clients performs <command>svn
          merge</command>, it doesn't modify the value of
          the <literal>svn:mergeinfo</literal> property at all.  So the
          subsequent commit, despite being the result of a merge,