[svnbook] r5367 committed - branches/1.7/en
cmpilato at users.sourceforge.net
cmpilato at users.sourceforge.net
Fri Jul 21 10:14:47 CDT 2017
Revision: 5367
http://sourceforge.net/p/svnbook/source/5367
Author: cmpilato
Date: 2017-07-21 15:14:47 +0000 (Fri, 21 Jul 2017)
Log Message:
-----------
Merge from ^/trunk/en r5365-5366, resolving conflicts.
Modified Paths:
--------------
branches/1.7/en/book/ch04-branching-and-merging.xml
Property Changed:
----------------
branches/1.7/en/
Index: branches/1.7/en
===================================================================
--- branches/1.7/en 2017-07-21 15:07:31 UTC (rev 5366)
+++ branches/1.7/en 2017-07-21 15:14:47 UTC (rev 5367)
Property changes on: branches/1.7/en
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:4202,4211,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4335,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041,5043,5082,5089,5094,5165,5285,5288,5290
\ No newline at end of property
+/trunk/en:4202,4211,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4335,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041,5043,5082,5089,5094,5165,5285,5288,5290,5365-5366
\ No newline at end of property
Modified: branches/1.7/en/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.7/en/book/ch04-branching-and-merging.xml 2017-07-21 15:07:31 UTC (rev 5366)
+++ branches/1.7/en/book/ch04-branching-and-merging.xml 2017-07-21 15:14:47 UTC (rev 5367)
@@ -872,34 +872,37 @@
test, and <command>svn commit</command> the local modifications
to your branch.</para>
- <sidebar id="svn.branchemerge.basicmerging.stayinsync.subtree">
- <title>Subtree Merges and Subtree Mergeinfo</title>
- <para>
- <indexterm>
- <primary>subtree merge</primary>
- </indexterm>
- <indexterm>
- <primary>subtree mergeinfo</primary>
- </indexterm>
- In most of the examples in this chapter the merge target is
- the root directory of a branch (see
- <xref linkend="svn.branchmerge.whatis"/>). While this is a
- best practice, you may occasionally need to merge directly to
- some child of the branch root. This type of merge is called a
- <firstterm>subtree merge</firstterm> and the mergeinfo recorded
- to describe it is called
- <firstterm>subtree mergeinfo</firstterm>. There is nothing
- special about subtree merges or subtree mergeinfo. In fact
- there is really only one important point to keep in mind
- about these concepts: the complete record of merges to a
- branch may not be contained solely in the mergeinfo on the
- branch root. You may have to look to any subtree mergeinfo
- to get a full accounting. Fortunately Subversion does this
- for you and rarely will you need to concern yourself with
- it. A brief example will help explain:</para>
+ </sect2>
- <informalexample>
- <screen>
+ <!-- =============================================================== -->
+ <sect2 id="svn.branchemerge.basicmerging.stayinsync.subtree">
+ <title>Subtree Merges and Subtree Mergeinfo</title>
+ <para>
+ <indexterm>
+ <primary>subtree merge</primary>
+ </indexterm>
+ <indexterm>
+ <primary>subtree mergeinfo</primary>
+ </indexterm>
+ In most of the examples in this chapter the merge target is
+ the root directory of a branch (see
+ <xref linkend="svn.branchmerge.whatis"/>). While this is a
+ best practice, you may occasionally need to merge directly to
+ some child of the branch root. This type of merge is called a
+ <firstterm>subtree merge</firstterm> and the mergeinfo recorded
+ to describe it is called
+ <firstterm>subtree mergeinfo</firstterm>. There is nothing
+ special about subtree merges or subtree mergeinfo. In fact
+ there is really only one important point to keep in mind
+ about these concepts: the complete record of merges to a
+ branch may not be contained solely in the mergeinfo on the
+ branch root. You may have to look to any subtree mergeinfo
+ to get a full accounting. Fortunately Subversion does this
+ for you and rarely will you need to concern yourself with
+ it. A brief example will help explain:</para>
+
+ <informalexample>
+ <screen>
# We need to merge r958 from trunk to branches/proj-X/doc/INSTALL,
# but that revision also affects main.c, which we don't want to merge:
$ svn log --verbose --quiet -r 958 ^/
@@ -949,25 +952,23 @@
--- Eliding mergeinfo from 'doc/INSTALL':
U doc/INSTALL
</screen>
- </informalexample>
+ </informalexample>
- <indexterm>
- <primary>mergeinfo elision</primary>
- </indexterm>
+ <indexterm>
+ <primary>mergeinfo elision</primary>
+ </indexterm>
- <para>You might be wondering why <filename>INSTALL</filename>
- in the above example has mergeinfo for r651-652, when we
- only merged r958. This is due to mergeinfo inheritance,
- which we'll cover in the sidebar
- <xref linkend="svn.branchmerge.basicmerging.mergeinfo.inheritance"
- />. Also note that the subtree mergeinfo on
- <filename>doc/INSTALL</filename> was removed, or
- <quote>elided</quote>. This is called
- <firstterm>mergeinfo elision</firstterm> and it occurs
- whenever Subversion detects redundant subtree mergeinfo.</para>
+ <para>You might be wondering why <filename>INSTALL</filename>
+ in the above example has mergeinfo for r651-652, when we
+ only merged r958. This is due to mergeinfo inheritance,
+ which we'll cover in the sidebar
+ <xref linkend="svn.branchmerge.basicmerging.mergeinfo.inheritance"
+ />. Also note that the subtree mergeinfo on
+ <filename>doc/INSTALL</filename> was removed, or
+ <quote>elided</quote>. This is called
+ <firstterm>mergeinfo elision</firstterm> and it occurs
+ whenever Subversion detects redundant subtree mergeinfo.</para>
- </sidebar>
-
<tip>
<para>Prior to Subversion 1.7, merges unconditionally updated
<emphasis>all</emphasis> of the subtree mergeinfo under the
@@ -1176,7 +1177,11 @@
<sect2 id="svn.branchmerge.basicmerging.mergeinfo">
<title>Mergeinfo and Previews</title>
- <para>The basic mechanism Subversion uses to track
+ <para>
+ <indexterm>
+ <primary>mergeinfo</primary>
+ <secondary>property</secondary>
+ </indexterm>The basic mechanism Subversion uses to track
changesets—that is, which changes have been merged to
which branches—is by recording data in versioned
properties. Specifically, merge data is tracked in
@@ -2876,7 +2881,6 @@
<xref linkend="svn.reposadmin.create.hooks"/>.</para>
</sect2>
-
<!-- =============================================================== -->
<sect2 id="svn.branchmerge.advanced.finalword">
<title>The Final Word on Merge Tracking</title>
More information about the svnbook-dev
mailing list