* doc/book/book/ch09.xml:
Update of the svn subcommands reference based on the
ouput of 'svn help' 0.37.0
Index: doc/book/book/ch09.xml
===================================================================
--- doc/book/book/ch09.xml (revision 8546)
+++ doc/book/book/ch09.xml (working copy)
@@ -51,6 +51,21 @@
<variablelist>
<varlistentry>
+ <term><option>--config-dir</option>
+ <replaceable>DIR</replaceable></term>
+ <listitem>
+ <para>Read the user configuration files from the passed directory.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--auto-props</option></term>
+ <listitem>
+ <para>Enable automatic properties.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--diff-cmd</option>
<replaceable>CMD</replaceable></term>
<listitem>
@@ -222,6 +237,13 @@
</varlistentry>
<varlistentry>
+ <term><option>--no-auto-props</option></term>
+ <listitem>
+ <para>Disable automatic properties.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--no-diff-deleted</option></term>
<listitem>
<para>Prevents Subversion from printing differences for
@@ -481,6 +503,9 @@
--targets FILENAME
--non-recursive (-N)
--quiet (-q)
+--config-dir DIR
+--auto-props
+--no-auto-props
</screen>
</refsect1>
@@ -519,6 +544,69 @@
<!-- ================================================================= -->
<refentry>
<refnamediv>
+ <refname>svn blame</refname>
+ <refpurpose>Output the content of specified files or URLs with
+ revision and author information in-line.</refpurpose>
+ </refnamediv>
+
+Output the content of specified files or URLs with revision and author information in-line.
+
+ <refsect1>
+ <title>Synopsis</title>
+ <programlisting>blame TARGET...</programlisting>
+ </refsect1>
+ <refsect1>
+ <title>Description</title>
+
+ <para>List the contents of each TARGET file with revision and
+ author information in-line</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Alternate Names</title>
+ <para>praise, annotate, ann</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Changes</title>
+ <para>Nothing</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Accesses Repository</title>
+ <para>Yes</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Switches</title>
+
+ <screen>
+--revision (-r) REV
+--username USER
+--password PASS
+--no-auth-cache
+--non-interactive
+--config-dir DIR
+ </screen>
+ </refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+
+ <screen>
+$svn blame test
+ 1 user1 Line 1
+ 1 user1 Line 2
+ 2 user2 Line 2-1
+ 1 user1 Line 3
+ 1 user1 Line 4
+ </screen>
+ </refsect1>
+ </refentry>
+
+ <!-- ================================================================= -->
+ <refentry>
+ <refnamediv>
<refname>svn cat</refname>
<refpurpose>Outputs the contents of the specified files or URLs.</refpurpose>
</refnamediv>
@@ -556,6 +644,9 @@
--revision (-r) REV
--username USER
--password PASS
+--no-auth-cache
+--non-interactive
+--config-dir DIR
</screen>
</refsect1>
@@ -639,6 +730,7 @@
--password PASS
--no-auth-cache
--non-interactive
+--config-dir DIR
</screen>
</refsect1>
@@ -758,7 +850,10 @@
<refsect1>
<title>Switches:</title>
- <para>None</para>
+ <screen>
+--diff3-cmd CMD
+--config-dir DIR
+ </screen>
</refsect1>
<refsect1>
@@ -845,6 +940,8 @@
--no-auth-cache
--non-interactive
--encoding ENC
+--editor-cmd CMD
+--config-dir DIR
</screen>
</refsect1>
@@ -994,6 +1091,8 @@
--non-interactive
--force-log
--encoding ENC
+--editor-cmd CMD
+--config-dir DIR
</screen>
</refsect1>
@@ -1124,6 +1223,8 @@
--no-auth-cache
--non-interactive
--encoding ENC
+--editor-cmd CMD
+--config-dir DIR
</screen>
</refsect1>
@@ -1178,53 +1279,36 @@
</refnamediv>
<refsect1>
<title>Synopsis</title>
- <programlisting>svn diff [-r N[:M]] [TARGET...]</programlisting>
- <programlisting>svn diff URL1[@N] URL2[@M]</programlisting>
+ <programlisting>svn diff [-r N[:M]] [--old OLD-TGT] [--new NEW-TGT] [PATH...]</programlisting>
+ <programlisting>svn diff -r N:M URL</programlisting>
+ <programlisting>svn diff [-r N[:M]] URL1[@N] URL2[@M]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
- <para>Display the differences between two paths. Each
- TARGET can be either a working copy path or URL. If no
- TARGET is specified, a value of '.' is assumed.</para>
+ <para>Display the differences between OLD-TGT and NEW-TGT. PATHs,
+ if given, are relative to OLD-TGT and NEW-TGT and restrict the
+ output to differences for those paths. OLD-TGT and NEW-TGT may
+ be working copy paths or URL[@REV].</para>
- <para>If TARGET is a URL, then revs N and M must be given
- via the <option>--revision</option>.</para>
+ <para>OLD-TGT defaults to the path '.' and NEW-TGT defaults to
+ OLD-TGT. N defaults to BASE or, if OLD-TGT is an URL, to HEAD.
+ M defaults to the current working version or, if NEW-TGT is an URL,
+ to HEAD. </para>
- <para>If TARGET is a working copy path, then the
- <option>--revision</option> switch means:</para>
+ <para><option>-r N</option> sets the revision of OLD-TGT to N,
+ <option>-r N:M</option> also sets the revision of NEW-TGT
+ to M.</para>
- <variablelist>
+ <para>The second form is a Shorthand for 'svn diff -r N:M
+ --old=URL --new=URL'</para>
- <varlistentry>
- <term><command>--revision N:M</command></term>
- <listitem>
- <para>The server compares TARGET@N and TARGET@M.</para>
- </listitem>
- </varlistentry>
+ <para>The third form is a Shorthand for 'svn diff [-r N[:M]]
+ --old=URL1 --new=URL2'</para>
- <varlistentry>
- <term><command>--revision N</command></term>
- <listitem>
- <para>The client compares TARGET@N against working copy.</para>
- </listitem>
- </varlistentry>
+ <para>Use just 'svn diff' to display local modifications in a
+ working copy</para>
- <varlistentry>
- <term><command>(no --revision)</command></term>
- <listitem>
- <para>The client compares base and working copies of
- TARGET.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- <para>If the alternate syntax is used, the server compares
- URL1 and URL2 at revisions N and M respectively. If
- either N or M are omitted, a value of HEAD is
- assumed.</para>
-
</refsect1>
<refsect1>
<title>Alternate Names</title>
@@ -1255,6 +1339,10 @@
--no-auth-cache
--non-interactive
--no-diff-deleted
+--notice-ancestry
+--config-dir DIR
+--old ARG
+--new ARG
</screen>
</refsect1>
@@ -1344,7 +1432,7 @@
<refsect1>
<title>Synopsis</title>
<programlisting>svn export [-r REV] URL [PATH]</programlisting>
- <programlisting>svn export PATH1 PATH2</programlisting>
+ <programlisting>svn export [-r REV] PATH1 [PATH2]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -1355,10 +1443,13 @@
omitted, the last component of the URL is used for the
local directory name.</para>
- <para>The second form exports a clean directory tree from
- the working copy specified by PATH1 into PATH2. All
- local changes will be preserved, but files not under
- version control will not be copied.</para>
+ <para>The second form exports a clean directory tree from the working
+ copy specified by
+ PATH1, at revision REV if it is given, otherwise at WORKING, into
+ PATH2. If PATH2 is omitted, the last component of the PATH1 is used
+ for the local directory name. If REV is not specified, all local
+ changes will be preserved, but files not under version control will
+ not be copied.</para>
</refsect1>
<refsect1>
@@ -1386,6 +1477,7 @@
--password PASS
--no-auth-cache
--non-interactive
+--config-dir DIR
</screen>
</refsect1>
@@ -1452,6 +1544,7 @@
<screen>
--version
--quiet (-q)
+--config-dir DIR
</screen>
</refsect1>
</refentry>
@@ -1504,6 +1597,10 @@
--non-interactive
--force-log
--encoding ENC
+--editor-cmd CMD
+--config-dir DIR
+--auto-props
+--no-auto-props
</screen>
</refsect1>
@@ -1590,6 +1687,7 @@
<screen>
--targets FILENAME
--recursive (-R)
+--config-dir DIR
</screen>
</refsect1>
@@ -1688,6 +1786,7 @@
--password PASS
--no-auth-cache
--non-interactive
+--config-dir DIR
</screen>
</refsect1>
@@ -1795,6 +1894,7 @@
--stop-on-copy
--incremental
--xml
+--config-dir DIR
</screen>
</refsect1>
@@ -1976,7 +2076,8 @@
<refsect1>
<title>Synopsis</title>
<programlisting>svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH]</programlisting>
- <programlisting>svn merge -r N:M SOURCE [PATH]</programlisting>
+ <programlisting>svn merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]</programlisting>
+ <programlisting>svn merge -r N:M SOURCE [WCPATH]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -1985,7 +2086,11 @@
at revisions N and M. These are the two sources to be
compared. The revisions default to HEAD if omitted.</para>
- <para>In the second form, SOURCE can be a URL or working
+ <para>In the second form, the URLs corresponding to the source
+ working copy paths define the sources to be compared. The
+ revisions must be specified.</para>
+
+ <para>In the third form, SOURCE can be a URL or working
copy item, in which case the corresponding URL is used.
This URL, at revisions N and M, defines the two sources
to be compared.</para>
@@ -2024,6 +2129,9 @@
--password PASS
--no-auth-cache
--non-interactive
+--diff3-cmd CMD
+--ignore-ancestry
+--config-dir DIR
</screen>
</refsect1>
@@ -2114,6 +2222,8 @@
--non-interactive
--encoding ENC
--force-log
+--editor-cmd CMD
+--config-dir DIR
</screen>
</refsect1>
@@ -2218,6 +2328,8 @@
--non-interactive
--encoding ENC
--force-log
+--editor-cmd CMD
+--config-dir DIR
</screen>
</refsect1>
@@ -2288,6 +2400,11 @@
--recursive (-R)
--revision (-r) REV
--revprop
+--username USER
+--password PASS
+--no-auth-cache
+--non-interactive
+--config-dir DIR
</screen>
</refsect1>
@@ -2354,6 +2471,13 @@
--revision (-r) REV
--revprop
--encoding ENC
+--username USER
+--password PASS
+--no-auth-cache
+--non-interactive
+--editor-cmd CMD
+--force
+--config-dir DIR
</screen>
</refsect1>
@@ -2420,6 +2544,12 @@
--recursive (-R)
--revision (-r) REV
--revprop
+--strict
+--username USER
+--password PASS
+--no-auth-cache
+--non-interactive
+--config-dir DIR
</screen>
</refsect1>
@@ -2489,6 +2619,12 @@
--recursive (-R)
--revision (-r) REV
--revprop
+--quiet
+--username USER
+--password PASS
+--no-auth-cache
+--non-interactive
+--config-dir DIR
</screen>
</refsect1>
@@ -2576,6 +2712,12 @@
--recursive (-R)
--revprop
--encoding ENC
+--username USER
+--password PASS
+--no-auth-cache
+--non-interactive
+--force
+--config-dir DIR
</screen>
</refsect1>
@@ -2691,6 +2833,7 @@
--targets FILENAME
--recursive (-R)
--quiet (-q)
+--config-dir DIR
</screen>
</refsect1>
@@ -2773,6 +2916,7 @@
--targets FILENAME
--recursive (-R)
--quiet (-q)
+--config-dir DIR
</screen>
</refsect1>
@@ -2901,6 +3045,14 @@
</varlistentry>
<varlistentry>
+ <term>'X'</term>
+ <listitem>
+ <para>Item is unversioned, but is used by
+ an externals definition</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>'?'</term>
<listitem>
<para>Item is not under version control.</para>
@@ -3087,6 +3239,7 @@
--no-auth-cache
--non-interactive
--no-ignore
+--config-dir DIR
</screen>
</refsect1>
@@ -3156,6 +3309,7 @@
<refsect1>
<title>Synopsis</title>
<programlisting>svn switch URL [PATH]</programlisting>
+ <programlisting>switch --relocate FROM TO [PATH...]</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
@@ -3197,6 +3351,7 @@
--password PASS
--no-auth-cache
--non-interactive
+--config-dir DIR
</screen>
</refsect1>
@@ -3318,7 +3473,7 @@
</varlistentry>
<varlistentry>
- <term>M</term>
+ <term>G</term>
<listitem>
<para>Merged</para>
</listitem>
@@ -3357,6 +3512,8 @@
--password PASS
--no-auth-cache
--non-interactive
+--diff3-cmd CMD
+--config-dir DIR
</screen>
</refsect1>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 1 16:13:38 2004