[svnbook] r4139 committed - Merge the relevant portions of r4137 from ^/trunk/en.
svnbook at googlecode.com
svnbook at googlecode.com
Wed Nov 2 14:36:48 CDT 2011
Revision: 4139
Author: cmpilato at gmail.com
Date: Wed Nov 2 12:36:14 2011
Log: Merge the relevant portions of r4137 from ^/trunk/en.
http://code.google.com/p/svnbook/source/detail?r=4139
Modified:
/branches/1.6/en
/branches/1.6/en/book/ch09-reference.xml
=======================================
--- /branches/1.6/en/book/ch09-reference.xml Wed Nov 2 12:17:42 2011
+++ /branches/1.6/en/book/ch09-reference.xml Wed Nov 2 12:36:14 2011
@@ -285,22 +285,54 @@
<term><option>--extensions</option> (<option>-x</option>)
<replaceable>ARG</replaceable></term>
<listitem>
- <para>Specifies an argument or arguments that Subversion
- should pass to an external diff command. This option is
- valid only when used with the <command>svn
- diff</command> or <command>svn merge</command> commands,
- with the
- <option>--diff-cmd</option> option.
- If you wish to pass multiple
- arguments, you must enclose all of them in quotes (e.g.,
- <userinput>svn diff --diff-cmd /usr/bin/diff -x
- "-b -E"</userinput>).</para>
+ <para>Specifies customizations which Subversion should
+ make when performing difference calculations. Valid
+ extensions include:</para>
+ <variablelist>
+ <varlistentry>
+ <term><option>--ignore-space-change</option>
(<option>-b</option>)</term>
+ <listitem>
+ <para>Ignore changes in the amount of white space.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--ignore-all-space</option>
(<option>-w</option>)</term>
+ <listitem>
+ <para>Ignore all white space.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--ignore-eol-style</option></term>
+ <listitem>
+ <para>Ignore changes in EOL (end-of-line) style.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--show-c-function</option>
(<option>-p</option>)</term>
+ <listitem>
+ <para>Show C function names in the diff output.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--unified</option>
(<option>-u</option>)</term>
+ <listitem>
+ <para>Show three lines of unified diff context.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>The default value of <replaceable>ARG</replaceable>
+ is <literal>-u</literal>. If you wish to pass multiple
+ arguments, you must enclose all of them in quotes.</para>
+ <para>Note that when Subversion is configured to invoke an
+ external diff command, the value of
+ the <option>--extension</option> (<option>-x</option>)
+ option isn't restricted to the previously mentioned
+ options, but may be <emphasis>any</emphasis> additional
+ arguments which Subversion should pass to that command.
+ </para>
</listitem>
-
- <!-- ### TODO: Document -u -b -w and - -ignore-eol-style -->
-
</varlistentry>
-
+
<varlistentry>
<term><option>--file</option> (<option>-F</option>)
<replaceable>FILENAME</replaceable>
@@ -945,28 +977,6 @@
--xml
</screen>
</informalexample>
-<!--
-
-### TODO:
- - -incremental : give output suitable for concatenation
- - -xml : output in XML
- -x [- -extensions] arg : Default: '-u'. When Subversion is invoking an
- external diff program, ARG is simply passed
along
- to the program. But when Subversion is using
its
- default internal diff implementation, or when
- Subversion is displaying blame annotations,
ARG
- could be any of the following:
- -u (- -unified):
- Output 3 lines of unified context.
- -b (- -ignore-space-change):
- Ignore changes in the amount of white
space.
- -w (- -ignore-all-space):
- Ignore all white space.
- - -ignore-eol-style:
- Ignore changes in EOL style
- - -force : force operation to run
-
--->
</refsect1>
<refsect1>
@@ -5468,8 +5478,37 @@
</listitem>
</varlistentry>
- <!-- TODO config-dir? Only 'svnadmin create' accepts it, and -->
- <!-- the underlying logic doesn't even use it. -->
+ <varlistentry>
+ <!-- Only 'svnadmin create' accepts it, and the underlying
+ logic doesn't even use it. Weird. -->
+ <term><option>--config-dir</option>
<replaceable>DIR</replaceable></term>
+ <listitem>
+ <para>Instructs Subversion to read configuration
+ information from the specified directory instead of the
+ default location (<filename>.subversion</filename> in
+ the user's home directory).</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--deltas</option></term>
+ <listitem>
+ <para>When creating a repository dump file, specify
+ changes in versioned properties and file contents as
+ deltas against their previous state.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--fs-type</option>
<replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>When creating a repository,
+ use <replaceable>ARG</replaceable> as the requested
+ filesyste type. <replaceable>ARG</replaceable> may be
+ either <literal>bdb</literal>
+ or <literal>fsfs</literal>.</para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term><option>--force-uuid</option></term>
@@ -5593,6 +5632,16 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--wait</option></term>
+ <listitem>
+ <para>For operations which require exclusive repository
+ access, wait until the requisite repository lock has
+ been obtained instead of immediately erroring out when
+ it cannot be.</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</sect2>
@@ -6384,13 +6433,11 @@
</refsect1>
<refsect1>
<title>Description</title>
-
<para>Remove one or more locks from each
<replaceable>LOCKED_PATH</replaceable>.</para>
</refsect1>
<refsect1>
- <title>Options</title>
-
+ <title>Options</title>
<para>None</para>
</refsect1>
@@ -6632,7 +6679,6 @@
<refsect1>
<title>Options</title>
-
<para>None</para>
</refsect1>
@@ -6703,7 +6749,6 @@
<refsect1>
<title>Options</title>
-
<para>None</para>
</refsect1>
@@ -6837,6 +6882,75 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--diff-copy-from</option></term>
+ <listitem>
+ <para>Print differences for copied items against the copy
+ source.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--extensions</option> (<option>-x</option>)
<replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Specifies customizations which Subversion should
+ make when performing difference calculations. Valid
+ extensions include:</para>
+ <variablelist>
+ <varlistentry>
+ <term><option>--ignore-space-change</option>
(<option>-b</option>)</term>
+ <listitem>
+ <para>Ignore changes in the amount of white space.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--ignore-all-space</option>
(<option>-w</option>)</term>
+ <listitem>
+ <para>Ignore all white space.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--ignore-eol-style</option></term>
+ <listitem>
+ <para>Ignore changes in EOL (end-of-line) style.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--unified</option>
(<option>-u</option>)</term>
+ <listitem>
+ <para>Show three lines of unified diff context.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>The default value is <literal>-u</literal>.</para>
+ <para>Note that when Subversion is configured to invoke an
+ external diff command, the value of
+ the <option>--extension</option> (<option>-x</option>)
+ option isn't restricted to the previously mentioned
+ options, but may be <emphasis>any</emphasis> additional
+ arguments which Subversion should pass to that command.
+ If you wish to pass multiple arguments, you must enclose
+ all of them in quotes.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--full-paths</option></term>
+ <listitem>
+ <para>Causes <command>svnlook tree</command> to display
+ full paths instead of hierarchical, indented path
+ components.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--limit</option> (<option>-l</option>)
<replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Limit output to a maximum number of
+ <replaceable>ARG</replaceable> items.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>--no-diff-deleted</option></term>
<listitem>
@@ -6860,8 +6974,14 @@
</varlistentry>
<varlistentry>
- <term><option>--revision</option>
- (<option>-r</option>)</term>
+ <term><option>--non-recursive</option>
(<option>-N</option>)</term>
+ <listitem>
+ <para>Operate on a single directory only.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--revision</option> (<option>-r</option>)</term>
<listitem>
<para>Specifies a particular revision number that you wish
to examine.</para>
@@ -6896,6 +7016,23 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--verbose</option> (<option>-v</option>)</term>
+ <listitem>
+ <para>Be verbose. When used with <command>svnlook
+ proplist</command>, for example, this causes Subversion
+ to display not just the list of properties, but their
+ values also.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--xml</option></term>
+ <listitem>
+ <para></para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</sect2>
More information about the svnbook-dev
mailing list