[svnbook commit] r3065 - trunk/src/en/book
fitz
noreply at red-bean.com
Mon May 5 22:44:00 CDT 2008
Author: fitz
Date: Mon May 5 22:44:00 2008
New Revision: 3065
Log:
Document svn:mergeinfo and correct docs for --use-merge-history.
This fixes issue #105, reported by Julian Foad.
* src/en/book/ch09-reference.xml: Fixey.
Modified:
trunk/src/en/book/ch09-reference.xml
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Mon May 5 22:44:00 2008
@@ -603,11 +603,7 @@
(<option>-g</option>)</term>
<listitem>
<para>Use or display additional information from merge
- history. When used with <command>svn copy</command> or
- <command>svn move</command>, the client will contact the
- server in order to propagate merge history information.
- When used with other commands, the client will display
- merge history information.</para>
+ history.</para>
</listitem>
</varlistentry>
@@ -2812,7 +2808,7 @@
--quiet (-q)
--verbose (-v)
--targets FILENAME
---user-merge-history (-g)
+--use-merge-history (-g)
--change (-c)
--stop-on-copy
--incremental
@@ -8171,6 +8167,19 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><literal>svn:mergeinfo</literal></term>
+ <listitem>
+
+ <para>Used by Subversion to track merge data. See
+ <xref linkend="svn.branchmerge.basicmerging.mergeinfo"/>
+ for details, but you should never edit this property
+ unless you <emphasis>really</emphasis> know what you're
+ doing.</para>
+
+ </listitem>
+ </varlistentry>
+
</variablelist>
</sect2>
More information about the svnbook-dev
mailing list