[svnbook] r4360 committed - * en/book/ch09-reference.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Thu Jan 24 16:13:36 CST 2013
Revision: 4360
Author: ptburba
Date: Thu Jan 24 14:13:21 2013
Log: * en/book/ch09-reference.xml
(svn.ref.svn.sw.reintegrate): Mark as deprecated and fix the
misleading description of what this option was used for.
http://code.google.com/p/svnbook/source/detail?r=4360
Modified:
/trunk/en/book/ch09-reference.xml
=======================================
--- /trunk/en/book/ch09-reference.xml Thu Jan 24 13:09:03 2013
+++ /trunk/en/book/ch09-reference.xml Thu Jan 24 14:13:21 2013
@@ -786,10 +786,13 @@
<varlistentry id="svn.ref.svn.sw.reintegrate">
<term><option>--reintegrate</option></term>
<listitem>
- <para>Used with the <command>svn merge</command>
- subcommand to merge all of the source URL's changes into
- the working copy. See
- <xref linkend="svn.branchemerge.basicmerging.stayinsync"/>
+ <para>Deprecated. Used with the <command>svn merge</command>
+ subcommand to merge changes from a feature branch back into
+ the feature branch's ancestor branch. Since Subversion 1.8
+ the <command>svn merge</command> subcommand automatically
+ detects this scenario and performs the appropriate merge.
+ See
+ <xref linkend="svn.branchemerge.basicmerging.reintegrate"/>
for details.</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list