[svnbook] r4133 committed - * en/book/ch04-branching-and-merging.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Nov 1 15:03:35 CDT 2011
Revision: 4133
Author: ptburba at gmail.com
Date: Tue Nov 1 13:02:38 2011
Log: * en/book/ch04-branching-and-merging.xml
(svn.branchmerge.basicmerging.mergeinfo): Move the tip about "mergeinfo"
from here...
(svn.branchemerge.basicmerging.stayinsync): ...back to here, which is
the first place we use the term. Also use the <firstterm> tag.
Suggested by: cmpilato
http://code.google.com/p/svnbook/source/detail?r=4133
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Tue Nov 1 08:21:55 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Tue Nov 1 13:02:38 2011
@@ -567,10 +567,28 @@
<replaceable>URL</replaceable></userinput>—tells
Subversion to merge all recent changes from the URL to the
current working directory (which is typically the root of your
- working copy). Also notice that we're using the caret
+ working copy). Notice that we're using the caret
(<literal>^</literal>) syntax<footnote><para>This was
introduced in svn 1.6.</para></footnote> to avoid having to
- type out the entire <filename>/trunk</filename> URL.</para>
+ type out the entire <filename>/trunk</filename> URL.
+ Also note the notification <quote>--- Recording mergeinfo
+ for merge...</quote>. This tells you that the merge is
+ updating the <literal>svn:mergeinfo</literal> property. We'll
+ discuss both this property and these notifications later in
+ this chapter, see
+ <xref linkend="svn.branchmerge.basicmerging.mergeinfo"/>.</para>
+
+ <tip>
+ <para>
+ <indexterm>
+ <primary>mergeinfo</primary>
+ </indexterm>
+ In this book and elsewhere (Subversion mailing lists, articles
+ on merge tracking, etc.) you will frequently come across the
+ term <firstterm>mergeinfo</firstterm>. This is simply shorthand
+ for the <literal>svn:mergeinfo</literal> property.
+ </para>
+ </tip>
<para>After running the prior example, your branch working copy
now contains new local modifications, and these edits are
@@ -925,18 +943,6 @@
Subversion properties, see <xref linkend="svn.advanced.props"
/>.)</para>
- <tip>
- <para>
- <indexterm>
- <primary>mergeinfo</primary>
- </indexterm>
- In this book and elsewhere (Subversion mailing lists, articles
- on merge tracking, etc.) you will frequently come across the
- term <quote>mergeinfo</quote>. This is simply shorthand for the
- <literal>svn:mergeinfo</literal> property.
- </para>
- </tip>
-
<para>You can examine the property, just like any other:</para>
<informalexample>
More information about the svnbook-dev
mailing list