[svnbook] r3565 commited - * src/en/book/ch09-reference.xml...

[codesite-noreply at google.com]

Revision: 3565
Author: cmpilato at gmail.com
Date: Fri Jul 24 12:06:05 2009
Log: * src/en/book/ch09-reference.xml
   Correct outdated example of 'svn mergeinfo' output.

Found by:  Karl Heinz Marbaise

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

Modified:
  /trunk/src/en/book/ch09-reference.xml

=======================================
--- /trunk/src/en/book/ch09-reference.xml	Thu Jun 18 12:32:02 2009
+++ /trunk/src/en/book/ch09-reference.xml	Fri Jul 24 12:06:05 2009
@@ -3354,16 +3354,39 @@
          <refsect1>
            <title>Examples</title>

-          <para>Find out which changesets your trunk directory has
-            already received as well as what changesets it's still
-            eligible to receive:</para>
+          <para>Find out which changesets your have been merged from
+            your trunk directory into your test branch:</para>

            <screen>
-$ svn mergeinfo branches/test
-Path: branches/test
-  Source path: /trunk
-    Merged ranges: r2:13
-    Eligible ranges: r13:15
+$ svn pget svn:mergeinfo ^/branches/test
+/branches/other:3-4
+/trunk:11-13,14,16
+$ svn mergeinfo --show-revs merged ^/trunk ^/branches/test
+r11
+r12
+r13
+r14
+r16
+$
+</screen>
+
+          <para>Note that the default output from the <command>svn
+            mergeinfo</command> command is to display merged revisions, so
+            the <option>--show-revs</option> option shown in the
+            command line of the previous example is not strictly
+            required.</para>
+
+          <para>Find out which changesets from your trunk directory
+            have not yet been merged into your test branch:</para>
+
+          <screen>
+$ svn mergeinfo --show-revs eligible ^/trunk ^/branches/test
+r15
+r17
+r20
+r21
+r22
+$
  </screen>

          </refsect1>