[svnbook commit] r3138 - trunk/src/en/book
sussman
noreply at red-bean.com
Sun Jun 15 22:15:01 CDT 2008
Author: sussman
Date: Sun Jun 15 22:15:01 2008
New Revision: 3138
Log:
* ch04-branching-and-merging.xml: suggestions from cmpilato.
Modified:
trunk/src/en/book/ch04-branching-and-merging.xml
Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml Sun Jun 15 22:15:01 2008
@@ -1982,9 +1982,9 @@
<para>The bottom line is that Subversion's merge-tracking
feature has an extremely complex internal implementation, and
the <literal>svn:mergeinfo</literal> property is the only
- window the user has into the machinery. As of this writing
- (Subversion 1.5) there are numbers of edge cases and possible
- unexpected behaviors that may pop up.</para>
+ window the user has into the machinery. Because the feature
+ is relatively new, there are numbers of edge cases and
+ possible unexpected behaviors that may pop up.</para>
<para>For example, sometimes mergeinfo will be generated when
running a simple <command>svn copy</command> or <command>svn
@@ -2017,15 +2017,14 @@
<itemizedlist>
<listitem>
- <para>For short-term <quote>feature</quote> branches,
- follow the simple procedure described throughout
+ <para>For short-term feature branches, follow the simple
+ procedure described throughout
<xref linkend="svn.branchmerge.basicmerging"/>.</para>
</listitem>
<listitem>
- <para>For long-lived <quote>release</quote> branches (as
- described in
+ <para>For long-lived release branches (as described in
<xref linkend="svn.branchmerge.commonpatterns"/>), only
- perform merges on the root of the branch, not on
+ perform merges on the root of the branch, not on
subdirectories.</para>
</listitem>
<listitem>
@@ -2041,14 +2040,13 @@
<para>Don't ever edit the <literal>svn:mergeinfo</literal>
property directly; use <command>svn
merge --record-only</command> to effect a desired change
- to the metdata (as demonstrated in
+ to the metadata (as demonstrated in
<xref linkend="svn.branchmerge.advanced.blockchanges"/>).</para>
</listitem>
<listitem>
<para>Always make sure you have complete read access to
all of your merge sources, and that your target working
- copy is entirely at <option>--depth
- infinity</option>.</para>
+ copy has no sparse directories.</para>
</listitem>
</itemizedlist>
More information about the svnbook-dev
mailing list