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

[svnbook at googlecode.com]

Revision: 4153
Author:   ptburba at gmail.com
Date:     Fri Nov  4 07:29:33 2011
Log:      * en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.basicmerging.mergeinfo): Add a tip on viewing
    large amounts of mergeinfo (I'm always shocked by how many
    people don't know the benefit of -v).


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

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Fri Nov  4 07:21:56 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Fri Nov  4 07:29:33 2011
@@ -1060,6 +1060,18 @@
            doing.</para>
        </warning>

+      <tip>
+        <para>The amount of <literal>svn:mergeinfo</literal> on a single
+          path can get quite large, as can the output of a
+          <command>svn propget --recursive</command> or
+          <command>svn proplist --recursive</command> when dealing with
+          large amounts of subtree mergeinfo, see
+          <xref  
linkend="svn.branchemerge.basicmerging.stayinsync.subtree"/>
+          . The formatted output produced by using the
+          <option>--verbose</option> option with either of these
+          subcommands can be very helpful in these cases.</para>
+      </tip>
+
        <para>The <literal>svn:mergeinfo</literal> property is
          automatically maintained by Subversion whenever you
          run <command>svn merge</command>.  Its value indicates which