[svnbook] r4022 committed - * en/book/ch09-reference.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Fri Aug 19 10:51:32 CDT 2011
Revision: 4022
Author: cmpilato at gmail.com
Date: Fri Aug 19 08:49:05 2011
Log: * en/book/ch09-reference.xml
Reference docs for 'svn merge --allow-mixed-revisions'.
http://code.google.com/p/svnbook/source/detail?r=4022
Modified:
/trunk/en/book/ch09-reference.xml
=======================================
--- /trunk/en/book/ch09-reference.xml Fri Aug 19 08:43:53 2011
+++ /trunk/en/book/ch09-reference.xml Fri Aug 19 08:49:05 2011
@@ -171,6 +171,20 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--allow-mixed-revisions</option></term>
+ <listitem>
+ <para>Disables the verification—performed by default
+ by <command>svn merge</command> as of Subversion
+ 1.7—that the items at and under the target
+ directory of a merge operation are at a uniform
+ revision. While merging into a single-revision working
+ copy target is the recommended best practice, this
+ option may be used to permit merges into mixed-revision
+ working copies as necessary.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>--auto-props</option></term>
<listitem>
@@ -3306,6 +3320,7 @@
<informalexample>
<screen>
--accept ACTION
+--allow-mixed-revisions
--change (-c) REV
--depth ARG
--diff3-cmd CMD
More information about the svnbook-dev
mailing list