[svnbook commit] r2933 - trunk/src/en/book
fitz
noreply at red-bean.com
Sun Dec 16 12:53:44 CST 2007
Author: fitz
Date: Sun Dec 16 12:53:42 2007
New Revision: 2933
Log:
Document new options in svn 1.5:
--accept
--changelist
--depth
--keep-changelist
--keep-local
--record-only
--remove
--use-merge-history
--with-all-revprops
--with-revprop
And I found two bugs!
Fixes issue #84.
* src/en/book/ch09-reference.xml (svn.ref.svn.sw): Frozzle the cons!
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 Sun Dec 16 12:53:42 2007
@@ -50,6 +50,18 @@
<variablelist>
<varlistentry>
+ <term><option>--accept</option>
+ <replaceable>ACTION</replaceable></term>
+ <listitem>
+ <para>Specify action for automatic conflict resolution.
+ Possible actions are (<literal>postpone</literal>,
+ <literal>base</literal>, <literal>mine</literal>,
+ <literal>theirs</literal>, <literal>edit</literal>, and
+ <literal>launch</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--auto-props</option></term>
<listitem>
<para>Enables auto-props, overriding the
@@ -69,6 +81,15 @@
</varlistentry>
<varlistentry>
+ <term><option>--changelist</option>
+ <replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Operate only on members of changelist named
+ <replaceable>ARG</replaceable>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--config-dir</option>
<replaceable>DIR</replaceable></term>
<listitem>
@@ -80,6 +101,17 @@
</varlistentry>
<varlistentry>
+ <term><option>--depth</option>
+ <replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Set the depth on a directory in a working copy to
+ one of <literal>empty</literal>,
+ <literal>files</literal>, <literal>immediates</literal>,
+ or <literal>infinity</literal>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--diff-cmd</option>
<replaceable>CMD</replaceable></term>
<listitem>
@@ -92,9 +124,6 @@
You can pass options to the diff program with the
<option>--extensions</option> option (more on that later
in this section).</para>
-
- <!-- TODO(fitz): Document -u -b -w and - -ignore-eol-style -->
-
</listitem>
</varlistentry>
@@ -152,6 +181,9 @@
example, <command>svn diff --diff-cmd /usr/bin/diff -x
"-b -E"</command>).</para>
</listitem>
+
+ <!-- TODO(fitz): Document -u -b -w and - -ignore-eol-style -->
+
</varlistentry>
<varlistentry>
@@ -240,6 +272,21 @@
</varlistentry>
<varlistentry>
+ <term><option>--keep-changelist</option></term>
+ <listitem>
+ <para>Don't delete changelist after commit.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--keep-local</option></term>
+ <listitem>
+ <para>Keep the local copy of a file or directory (used
+ with the <command>svn delete</command> command).</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--limit</option>
<replaceable>NUM</replaceable></term>
<listitem>
@@ -394,6 +441,14 @@
</varlistentry>
<varlistentry>
+ <term><option>--record-only</option></term>
+ <listitem>
+ <para>Mark revisions as merged (for use with
+ <option>--revision</option> (<option>-r</option>)</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--recursive</option> (<option>-R</option>)</term>
<listitem>
<para>Makes a subcommand recurse into subdirectories.
@@ -416,6 +471,15 @@
</varlistentry>
<varlistentry>
+ <term><option>--remove</option>
+ <replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Disassociate <replaceable>ARG</replaceable> from a
+ changelist</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--revision</option> (<option>-r</option>)
<replaceable>REV</replaceable>
</term>
@@ -508,6 +572,19 @@
</varlistentry>
<varlistentry>
+ <term><option>--use-merge-history</option>
+ (<option>-g</option>)</term>
+ <listitem>
+ <para>Use or display additional information from merge
+ history. When used with svn copy or svn move, 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>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--verbose</option> (<option>-v</option>)</term>
<listitem>
<para>Requests that the client print out as much
@@ -532,6 +609,42 @@
</varlistentry>
<varlistentry>
+ <term><option>--version</option></term>
+ <listitem>
+ <para>Prints the client version info. This information
+ not only includes the version number of the client,
+ but also a listing of all repository access modules
+ that the client can use to access a Subversion
+ repository. With <option>--quiet</option>
+ (<option>-q</option>) it prints only the version number
+ in a compact form.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--with-all-revprops</option></term>
+ <listitem>
+ <para>Used with <command>svn log --xml</command>, this
+ option will retrieve and display all revision
+ properties in the log output.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--with-revprop</option>
+ <replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>When used with any command that writes to the
+ repository, set the revision property, using thn
+ <replaceable>NAME=VALUE</replaceable> format,
+ <replaceable>NAME</replaceable> to
+ <replaceable>VALUE</replaceable>. When used with
+ <command>svn log --xml</command>, display the value of
+ <replaceable>ARG</replaceable> in the log output.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--xml</option></term>
<listitem>
<para>Prints output in XML format.</para>
More information about the svnbook-dev
mailing list