[svnbook commit] r3062 - trunk/src/en/book
fitz
noreply at red-bean.com
Sun May 4 22:45:55 CDT 2008
Author: fitz
Date: Sun May 4 22:45:55 2008
New Revision: 3062
Log:
Add --reintegrate option to ch09 reference and switch old and busted
example to use it (new hotness).
This fixes issue #96, reported by khmarbaise
* src/en/book/ch09-reference.xml: Document --reintegrate.
Modified:
trunk/src/en/book/ch09-reference.xml
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Sun May 4 22:45:55 2008
@@ -462,6 +462,17 @@
</varlistentry>
<varlistentry>
+ <term><option>--reintegrate</option> (<option>-R</option>)</term>
+ <listitem>
+ <para>Used with the <command>svn merge</command>
+ subcommand, merges all of the source URL's changes into
+ the working copy. See
+ <xref linkend="svn.branchemerge.basicmerging.stayinsync"/>
+ for details.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--relocate</option> <replaceable>FROM TO
[PATH...]</replaceable></term>
<listitem>
@@ -3077,6 +3088,7 @@
--depth ARG
--record-only
--accept ARG
+--reintegrate
--quiet (-q)
--force
--dry-run
@@ -3095,25 +3107,25 @@
<title>Examples</title>
<para>Merge a branch back into the trunk (assuming that
- you have a working copy of the trunk, and that the branch
- was created in revision 250):</para>
+ you have an up to date working copy of the trunk).</para>
<screen>
-$ svn merge -r 250:HEAD http://svn.red-bean.com/repos/branches/my-branch
-U myproj/tiny.txt
-U myproj/thhgttg.txt
-U myproj/win.txt
-U myproj/flo.txt
-</screen>
-
- <para>If you branched at revision 23, and you want to
- merge changes on trunk into your branch, you could do
- this from inside the working copy of your branch:</para>
-
- <screen>
-$ svn merge -r 23:30 file:///var/svn/repos/trunk/vendors
-U myproj/thhgttg.txt
-…
+$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch
+--- Merging differences between repository URLs into '.':
+U button.c
+U integer.c
+U Makefile
+ U .
+
+$ # build, test, verify, ...
+
+$ svn commit -m "Merge my-calc-branch back into trunk!"
+Sending .
+Sending button.c
+Sending integer.c
+Sending Makefile
+Transmitting file data ..
+Committed revision 391.
</screen>
<para>To merge changes to a single file:</para>
More information about the svnbook-dev
mailing list