[svnbook] r4131 committed - * en/book/ch04-branching-and-merging.xml...
C. Michael Pilato
cmpilato at red-bean.com
Tue Nov 1 11:02:38 CDT 2011
Maybe instead of <quote>mergeinfo</quote>, you could use
Also, given that we have multiple prior examples of 'svn merge' output which
refer to "mergeinfo" (as in "Recording mergeinfo for merge..."), should this
tip fall earlier in the chapter?
On 11/01/2011 11:22 AM, svnbook at googlecode.com wrote:
> Revision: 4131
> Author: ptburba at gmail.com
> Date: Tue Nov 1 08:21:55 2011
> Log: * en/book/ch04-branching-and-merging.xml
> (svn.branchmerge.basicmerging.mergeinfo): Add a tip explaining
> that "mergeinfo" is just shorthand for the svn:mergeinfo
> property. We use this shorthand a bit in the book, but more
> importantly it is used extensively everywhere else. Also
> add "mergeinfo" to the index.
> --- /trunk/en/book/ch04-branching-and-merging.xml Tue Nov 1 07:27:08 2011
> +++ /trunk/en/book/ch04-branching-and-merging.xml Tue Nov 1 08:21:55 2011
> @@ -925,6 +925,18 @@
> Subversion properties, see <xref linkend="svn.advanced.props"
> + <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>
> svnbook-dev mailing list
> svnbook-dev at red-bean.com
C. Michael Pilato <cmpilato at red-bean.com> | http://cmpilato.blogspot.com/
More information about the svnbook-dev