Revision: 4125
Author: ptburba at gmail.com
Date: Fri Oct 28 09:32:25 2011
Log: * en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.stayinsync): Fix some typos and throw
<command> tags around some subcommands.
http://code.google.com/p/svnbook/source/detail?r=4125
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Thu Oct 27 13:56:53 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Fri Oct 28 09:32:25 2011
@@ -699,19 +699,19 @@
making changes to your branch over the past week you now have
a working copy that is at mixed-revisions
(see <xref linkend="svn.basic.in-action.mixedrevs"/>). With
- the release of Subversion 1.7 the merge command disables merges
- into mixed-revision working copies by default. Without going
- into too much detail, this is because of limitations in the way
- merges are tracked by the svn:mergeinfo property (see the
- section called
+ the release of Subversion 1.7 the <command>svn merge</command>
+ subcommand disables merges into mixed-revision working copies by
+ default. Without going into too much detail, this is because of
+ limitations in the way merges are tracked by the
+ <literal>svn:mergeinfo</literal> property (see
<xref linkend="svn.branchmerge.basicmerging.mergeinfo"/>
for details). These limitations mean that merges into
mixed-revision working copies can result in unexpected text
- and tree conflicts. The merge command option
- <option>--allow-mixed-revisions</option> allows you to override
- this prohibition, but you should only do that if you understand
- the ramifications and have a good reason for doing so. We
- don't have any reason to do so here, so we update the working
+ and tree conflicts. The <command>svn merge</command> subcommand
+ option <option>--allow-mixed-revisions</option> allows you to
+ override this prohibition, but you should only do that if you
+ understand the ramifications and have a good reason for doing so.
+ We don't have any reason to do so here, so we update the working
copy and then reattempt the merge.</para>
<informalexample>