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

[svnbook at googlecode.com]

Revision: 4164
Author:   ptburba at gmail.com
Date:     Mon Nov  7 08:17:54 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.advanced.finalword): Rework a little to reflect
    the fact that merge tracking isn't new anymore.


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

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Mon Nov  7 07:41:56 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Mon Nov  7 08:17:54 2011
@@ -2738,9 +2738,7 @@
        <para>The bottom line is that Subversion's merge-tracking
          feature has an extremely complex internal implementation, and
          the <literal>svn:mergeinfo</literal> property is the only
-        window the user has into the machinery.  Because the feature
-        is relatively new, a number of edge cases and
-        possible unexpected behaviors may pop up.</para>
+        window the user has into the machinery.</para>

        <para>Sometimes mergeinfo will appear on files that you didn't
          expect to be touched by an operation.  Sometimes mergeinfo
@@ -2754,12 +2752,11 @@
          even <quote>inheritance</quote> from parent to child
          directories.</para>

-      <para>We've chosen not to cover these detailed topics in this
-        book for a couple of reasons.  First, the level of detail is
-        absolutely overwhelming for a typical user.  Second, as
-        Subversion continues to improve, we feel that a typical user
-        <emphasis>shouldn't</emphasis> have to understand these
-        concepts; they'll eventually fade into the background as pesky
+      <para>In this book we've chosen to only briefly (if at all) cover
+        these detailed topics for a couple of reasons.  First, the level
+        of detail is absolutely overwhelming for a typical user.  Second,
+        the typical user <emphasis>shouldn't</emphasis> have to understand
+        these concepts; they mostly remain in the background as pesky
          implementation details.  All that said, if you enjoy this sort
          of thing, you can get a fantastic overview in a paper posted
          at CollabNet's website: <ulink