[svnbook] r4124 committed - * en/book/ch04-branching-and-merging.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Thu Oct 27 15:57:13 CDT 2011
Revision: 4124
Author: ptburba at gmail.com
Date: Thu Oct 27 13:56:53 2011
Log: * en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.finalword): Tweak a recommended best
practice to reflect 1.7 reality.
http://code.google.com/p/svnbook/source/detail?r=4124
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Thu Oct 27 13:48:50 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Thu Oct 27 13:56:53 2011
@@ -2365,13 +2365,14 @@
subdirectories.</para>
</listitem>
<listitem>
- <para>Never merge into working copies with a mixture of
- working revision numbers, or with
- <quote>switched</quote> subdirectories (as described next
- in <xref linkend="svn.branchmerge.switchwc"/>). A merge
- target should be a working copy which represents
- a <emphasis>single</emphasis> location in the repository
- at a single point in time.</para>
+ <para>Never use the <option>--allow-mixed-revisions</option>
+ option to merge into working copies with a mixture of
+ working revision numbers. Nor should your merge target
+ have <quote>switched</quote> subdirectories (as described
+ next in <xref linkend="svn.branchmerge.switchwc"/>). A
+ merge target should be a working copy which represents a
+ <emphasis>single</emphasis> location in the repository at
+ a single point in time.</para>
</listitem>
<listitem>
<para>Don't ever edit the <literal>svn:mergeinfo</literal>
More information about the svnbook-dev
mailing list