[svnbook] r4357 committed - * en/book/ch09-reference.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Thu Jan 24 09:47:42 CST 2013
Revision: 4357
Author: ptburba
Date: Thu Jan 24 07:46:42 2013
Log: * en/book/ch09-reference.xml
(svn.ref.svn.c.mergeinfo): Update 'svn mergeinfo' reference to
correspond to 1.8 behavior.
http://code.google.com/p/svnbook/source/detail?r=4357
Modified:
/trunk/en/book/ch09-reference.xml
=======================================
--- /trunk/en/book/ch09-reference.xml Tue Jan 22 08:25:16 2013
+++ /trunk/en/book/ch09-reference.xml Thu Jan 24 07:46:42 2013
@@ -3856,10 +3856,10 @@
merges) between <replaceable>SOURCE-URL</replaceable> and
<replaceable>TARGET</replaceable>. If
the <option>--show-revs</option> option is not provided,
- display revisions which have been merged
- from <replaceable>SOURCE-URL</replaceable>
- to <replaceable>TARGET</replaceable>. Otherwise, display
- either <literal>merged</literal>
+ display a graphical representation of revisions which have
+ been fully merged from <replaceable>SOURCE-URL</replaceable>
+ to <replaceable>TARGET</replaceable>. Otherwise, list
+ either the <literal>merged</literal>
or <literal>eligible</literal> revisions as specified by
the <option>--show-revs</option> option.</para>
@@ -3881,42 +3881,46 @@
<refsect1>
<title>Examples</title>
- <para>Find out which changesets your have been merged from
- your trunk directory into your test branch:</para>
+ <para>Graphical summary of the merges from one branch to
+ another:</para>
<informalexample>
<screen>
-$ svn propget 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
-$
+$ svn mergeinfo ^/trunk feature-branch
+ youngest last repos.
+ common full tip of path of
+ ancestor merge branch branch
+
+ 11 16 33
+ | | |
+ -------| |------------ trunk
+ \ \
+ \ \
+ --| |------------ feature-branch
+ |
+ 33
</screen>
</informalexample>
- <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>List the operative revisions merged from one branch to
+ another:</para>
+
+ <informalexample>
+ <screen>
+$ svn mergeinfo ^/trunk feature-branch --show-revs merged
+r15
+r16
+</screen>
+ </informalexample>
- <para>Find out which changesets from your trunk directory
- have not yet been merged into your test branch:</para>
+ <para>List the operative revisions eligible to be merged from
+ one branch to another:</para>
<informalexample>
<screen>
-$ svn mergeinfo --show-revs eligible ^/trunk ^/branches/test
-r15
-r17
-r20
-r21
-r22
-$
+$ svn mergeinfo ^/trunk feature-branch --show-revs eligible
+r28
+r30
</screen>
</informalexample>
More information about the svnbook-dev
mailing list