[svnbook] r4179 committed - * en/book/ch04-branching-and-merging.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Nov 8 11:46:22 CST 2011
Revision: 4179
Author: ptburba at gmail.com
Date: Tue Nov 8 09:45:15 2011
Log: * en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.ancestry): Index the term 'ancestry'.
Add a tip about --ignore-ancestry's effect on merge tracking.
http://code.google.com/p/svnbook/source/detail?r=4179
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Tue Nov 8 09:26:55 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Tue Nov 8 09:45:15 2011
@@ -2569,7 +2569,11 @@
<sect2 id="svn.branchmerge.advanced.ancestry">
<title>Noticing or Ignoring Ancestry</title>
- <para>When conversing with a Subversion developer, you might
+ <para>
+ <indexterm>
+ <primary>ancestry</primary>
+ </indexterm>
+ When conversing with a Subversion developer, you might
very likely hear reference to the term
<firstterm>ancestry</firstterm>. This word is used to
describe the relationship between two objects in a
@@ -2629,6 +2633,15 @@
<command>svn diff</command> to behave like the
<command>svn merge</command> command.)</para>
+ <tip>
+ <para>The <option>--ignore-ancestry</option> option also disables
+ <xref linkend="svn.branchmerge.basicmerging.mergetracking"/>.
+ This means that <literal>svn:mergeinfo</literal> is not considered
+ when <command>svn merge</command> is determining what revisions
+ to merge, nor is <literal>svn:mergeinfo</literal> recorded to
+ describe the merge.</para>
+ </tip>
+
</sect2>
<!-- ===============================================================
-->
More information about the svnbook-dev
mailing list