[svnbook commit] r2943 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Mon Dec 17 16:25:28 CST 2007
Author: cmpilato
Date: Mon Dec 17 16:25:21 2007
New Revision: 2943
Log:
Add some placeholders for undocumented runtime configuration options.
Modified:
trunk/src/en/book/ch07-customizing-svn.xml
Modified: trunk/src/en/book/ch07-customizing-svn.xml
==============================================================================
--- trunk/src/en/book/ch07-customizing-svn.xml (original)
+++ trunk/src/en/book/ch07-customizing-svn.xml Mon Dec 17 16:25:21 2007
@@ -361,6 +361,16 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><literal>http-auth-types</literal></term>
+ <para>### TODO ###</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>http-library</literal></term>
+ <para>### TODO ###</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><literal>neon-debug-mask</literal></term>
<listitem>
<para>This is an integer mask that the underlying HTTP
@@ -487,19 +497,24 @@
precedence over higher-numbered locations) is:</para>
<orderedlist>
<listitem>
- <para>Command-line option <literal>--editor-cmd</literal></para>
+ <para>Command-line option
+ <literal>--editor-cmd</literal></para>
</listitem>
<listitem>
- <para>Environment variable <literal>SVN_EDITOR</literal></para>
+ <para>Environment variable
+ <literal>SVN_EDITOR</literal></para>
</listitem>
<listitem>
- <para>Configuration option <literal>editor-cmd</literal></para>
+ <para>Configuration option
+ <literal>editor-cmd</literal></para>
</listitem>
<listitem>
- <para>Environment variable <literal>VISUAL</literal></para>
+ <para>Environment variable
+ <literal>VISUAL</literal></para>
</listitem>
<listitem>
- <para>Environment variable <literal>EDITOR</literal></para>
+ <para>Environment variable
+ <literal>EDITOR</literal></para>
</listitem>
<listitem>
<para>Possibly, a default value built in to Subversion
@@ -552,6 +567,16 @@
parameter.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><literal>merge-tool-cmd</literal></term>
+ <listitem>
+ <para>This specifies the program that Subversion will
+ use to perform three-way merge operations on your
+ versioned files. See <xref
+ linkend="svn.advanced.externaldifftools"/> for more
+ details on using such programs.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
<para>The <literal>tunnels</literal> section allows you to
@@ -595,8 +620,8 @@
the <option>--no-ignore</option> command-line flag.</para>
<para>For information on more fine-grained control of
- ignored items, see <xref linkend="svn.advanced.props.special.ignore"
- />.</para>
+ ignored items, see
+ <xref linkend="svn.advanced.props.special.ignore" />.</para>
</listitem>
</varlistentry>
@@ -652,9 +677,35 @@
timestamps on files that they touch.</para>
</listitem>
</varlistentry>
-
- <!-- ###TODO add description of other options shown in example
- registry file, e.g., template-root -->
+
+ <varlistentry>
+ <term><literal>mime-types-file</literal></term>
+ <listitem>
+ <para>### TODO ###</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>preserved-conflict-file-exts</literal></term>
+ <listitem>
+ <para>### TODO ###</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>interactive-conflicts</literal></term>
+ <listitem>
+ <para>### TODO ###</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>no-unlock</literal></term>
+ <listitem>
+ <para>### TODO ###</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
<para>The <literal>auto-props</literal> section controls
@@ -859,7 +910,10 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.advanced.externaldifftools">
- <title>Using External Differencing Tools</title>
+ <title>Using External Differencing and Merge Tools</title>
+
+ <para>### TODO: what's the difference between diff3-cmd and
+ merge-tool-cmd? ###</para>
<para>The presence of <option>--diff-cmd</option> and
<option>--diff3-cmd</option> options, and similarly named
@@ -880,19 +934,15 @@
utilities with more than a handful of options and parameters,
most of which were quite specific to the utilities. Some time
later, Subversion grew its own internal differencing library,
- and as a failover mechanism,
- <footnote>
- <para>Subversion developers are good, but even the best make
- mistakes.</para>
- </footnote>
- the <option>--diff-cmd</option> and <option>--diff3-cmd</option>
- options were added to the Subversion command-line client so
- users could more easily indicate that they preferred to use the
- GNU diff and diff3 utilities instead of the newfangled internal
- diff library. If those options were used, Subversion would
- simply ignore the internal diff library, and fall back to
- running those external programs, lengthy argument lists and all.
- And that's where things remain today.</para>
+ and as a failover mechanism, the <option>--diff-cmd</option> and
+ <option>--diff3-cmd</option> options were added to the
+ Subversion command-line client so users could more easily
+ indicate that they preferred to use the GNU diff and diff3
+ utilities instead of the newfangled internal diff library. If
+ those options were used, Subversion would simply ignore the
+ internal diff library, and fall back to running those external
+ programs, lengthy argument lists and all. And that's where
+ things remain today.</para>
<para>It didn't take long for folks to realize that having such
easy configuration mechanisms for specifying that Subversion
More information about the svnbook-dev
mailing list