[svnbook] r4431 committed - * en/book/ref-svn.xml,...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Feb 12 14:02:48 CST 2013
Revision: 4431
Author: cmpilato at gmail.com
Date: Tue Feb 12 12:02:17 2013
Log: * en/book/ref-svn.xml,
* en/book/ref-svnsync.xml,
* en/book/ref-svnversion.xml
Indentation/whitespace/comment tweaks only.
http://code.google.com/p/svnbook/source/detail?r=4431
Modified:
/trunk/en/book/ref-svn.xml
/trunk/en/book/ref-svnsync.xml
/trunk/en/book/ref-svnversion.xml
=======================================
--- /trunk/en/book/ref-svn.xml Fri Feb 8 22:33:40 2013
+++ /trunk/en/book/ref-svn.xml Tue Feb 12 12:02:17 2013
@@ -34,29 +34,29 @@
command-line client program, including some examples of each
subcommand's typical uses.</para>
- <para>While Subversion has different options for its
- subcommands, all options exist in a single
- namespace—that is, each option is guaranteed to mean the
- roughly same thing regardless of the subcommand you use it
- with. For example, <option>--verbose</option>
- (<option>-v</option>) always means <quote>verbose
- output,</quote> regardless of the subcommand you use it
- with.</para>
+ <para>While Subversion has different options for its
+ subcommands, all options exist in a single
+ namespace—that is, each option is guaranteed to mean the
+ roughly same thing regardless of the subcommand you use it
+ with. For example, <option>--verbose</option>
+ (<option>-v</option>) always means <quote>verbose
+ output,</quote> regardless of the subcommand you use it
+ with.</para>
- <para>The <command>svn</command> command-line client usually
- exits quickly with an error if you pass it an option which
- does not apply to the specified subcommand. But as of
- Subversion 1.5, several of the options which apply to
- all—or nearly all—of the subcommands have been
- deemed acceptable by all subcommands, even if they have no
- effect on some of them. (This change was made primarily to
- improve the client's ability to called from custom wrapping
- scripts.) These options appear grouped together in the
- command-line client's usage messages as global options, as can
- be seen in the following bit of output:</para>
+ <para>The <command>svn</command> command-line client usually
+ exits quickly with an error if you pass it an option which
+ does not apply to the specified subcommand. But as of
+ Subversion 1.5, several of the options which apply to
+ all—or nearly all—of the subcommands have been
+ deemed acceptable by all subcommands, even if they have no
+ effect on some of them. (This change was made primarily to
+ improve the client's ability to called from custom wrapping
+ scripts.) These options appear grouped together in the
+ command-line client's usage messages as global options, as can
+ be seen in the following bit of output:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svn help upgrade
upgrade: Upgrade the metadata storage format for a working copy.
usage: upgrade [WCPATH...]
@@ -81,1031 +81,1029 @@
servers:global:http-library=serf
$
</screen>
- </informalexample>
+ </informalexample>
- <para><command>svn</command> subcommands recognize the following
- options:</para>
-
- <variablelist id="svn.ref.svn.sw">
- <title>svn Options</title>
-
- <varlistentry id="svn.ref.svn.sw.accept">
- <term><option>--accept</option>
<replaceable>ACTION</replaceable></term>
- <listitem>
- <para>Specifies an action for automatic conflict
- resolution, disabling the interactive prompts which ask
- the user how to handle each conflict as it is noticed.
- Though which of the specific actions are applicable
- differs depending on which subcommand is in use,
- Subversion supports the following long (and short)
- values for <replaceable>ACTION</replaceable>:</para>
- <variablelist>
- <varlistentry>
- <term><literal>postpone</literal>
- (<literal>p</literal>)</term>
- <listitem>
- <para>Take no resolution action at all and instead
- allow the conflicts to be recorded for future
- resolution.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>edit</literal>
- (<literal>e</literal>)</term>
- <listitem>
- <para>Open each conflicted file in a text editor for
- manual resolution of line-based conflicts.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>launch</literal>
- (<literal>l</literal>)</term>
- <listitem>
- <para>Launch an interactive merge conflict
- resolution tool for each conflicted file.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>base</literal></term>
- <listitem>
- <para>Choose the file that was the (unmodified)
- <literal>BASE</literal> revision before you tried
- to integrate changes from the server into
- your working copy.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>working</literal></term>
- <listitem>
- <para>Assuming that you've manually handled the
- conflict resolution, choose the version of the file
- as it currently stands in your working copy.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>mine-full</literal>
- (<literal>mf</literal>)</term>
- <listitem>
- <para>Resolve conflicted files by preserving all
- local modifications and discarding all changes
- fetched from the server during the operation which
- caused the conflict.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>theirs-full</literal>
- (<literal>tf</literal>)</term>
- <listitem>
- <para>Resolve conflicted files by discarding all
- local modifications and integrating all changes
- fetched from the server during the operation which
- caused the conflict.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>mine-conflict</literal>
- (<literal>mc</literal>)</term>
- <listitem>
- <para>Resolve conflicted files by preferring local
- modifications over the changes fetched from the
- server in conflicting regions of each file's
- content.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><literal>theirs-conflict</literal>
- (<literal>tc</literal>)</term>
- <listitem>
- <para>Resolve conflicted files by preferring the
- changes fetched from the server over local
- modifications in conflicting regions of each file's
- content.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- <para>Consult the output of <command>svn help
- <replaceable>SUBCOMMAND</replaceable></command> to see
- exactly which actions are supported by the specific
- subcommand of interest.</para>
- </listitem>
- </varlistentry>
+ <para><command>svn</command> subcommands recognize the following
+ options:</para>
+
+ <variablelist id="svn.ref.svn.sw">
+ <title>svn Options</title>
+
+ <varlistentry id="svn.ref.svn.sw.accept">
+ <term><option>--accept</option>
<replaceable>ACTION</replaceable></term>
+ <listitem>
+ <para>Specifies an action for automatic conflict
+ resolution, disabling the interactive prompts which ask
+ the user how to handle each conflict as it is noticed.
+ Though which of the specific actions are applicable
+ differs depending on which subcommand is in use,
+ Subversion supports the following long (and short)
+ values for <replaceable>ACTION</replaceable>:</para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>postpone</literal>
+ (<literal>p</literal>)</term>
+ <listitem>
+ <para>Take no resolution action at all and instead
+ allow the conflicts to be recorded for future
+ resolution.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>edit</literal>
+ (<literal>e</literal>)</term>
+ <listitem>
+ <para>Open each conflicted file in a text editor for
+ manual resolution of line-based conflicts.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>launch</literal>
+ (<literal>l</literal>)</term>
+ <listitem>
+ <para>Launch an interactive merge conflict
+ resolution tool for each conflicted file.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>base</literal></term>
+ <listitem>
+ <para>Choose the file that was the (unmodified)
+ <literal>BASE</literal> revision before you tried
+ to integrate changes from the server into
+ your working copy.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>working</literal></term>
+ <listitem>
+ <para>Assuming that you've manually handled the
+ conflict resolution, choose the version of the file
+ as it currently stands in your working copy.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>mine-full</literal>
+ (<literal>mf</literal>)</term>
+ <listitem>
+ <para>Resolve conflicted files by preserving all
+ local modifications and discarding all changes
+ fetched from the server during the operation which
+ caused the conflict.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>theirs-full</literal>
+ (<literal>tf</literal>)</term>
+ <listitem>
+ <para>Resolve conflicted files by discarding all
+ local modifications and integrating all changes
+ fetched from the server during the operation which
+ caused the conflict.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>mine-conflict</literal>
+ (<literal>mc</literal>)</term>
+ <listitem>
+ <para>Resolve conflicted files by preferring local
+ modifications over the changes fetched from the
+ server in conflicting regions of each file's
+ content.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>theirs-conflict</literal>
+ (<literal>tc</literal>)</term>
+ <listitem>
+ <para>Resolve conflicted files by preferring the
+ changes fetched from the server over local
+ modifications in conflicting regions of each file's
+ content.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>Consult the output of <command>svn help
+ <replaceable>SUBCOMMAND</replaceable></command> to see
+ exactly which actions are supported by the specific
+ subcommand of interest.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.allow_mixed_revisions">
- <term><option>--allow-mixed-revisions</option></term>
- <listitem>
- <para>Disables the verification—performed by default
- by <command>svn merge</command> as of Subversion
- 1.7—that the target of a merge operation and all
- of its children are at a uniform revision. While
- merging into a single-revision working copy target is
- the recommended best practice, this option may be used
- to permit merges into mixed-revision working copies as
- necessary.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.allow_mixed_revisions">
+ <term><option>--allow-mixed-revisions</option></term>
+ <listitem>
+ <para>Disables the verification—performed by default
+ by <command>svn merge</command> as of Subversion
+ 1.7—that the target of a merge operation and all
+ of its children are at a uniform revision. While
+ merging into a single-revision working copy target is
+ the recommended best practice, this option may be used
+ to permit merges into mixed-revision working copies as
+ necessary.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.auto_props">
- <term><option>--auto-props</option></term>
- <listitem>
- <para>Enables automatic property assignment (per runtime
- configuration rules), overriding the
- <literal>enable-auto-props</literal> runtime
- configuration directive.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.change">
- <term><option>--change</option> (<option>-c</option>)
<replaceable>ARG</replaceable></term>
- <listitem>
- <para>Perform the requested operation using a specific
- <quote>change</quote>. Generally speaking, this option
- is syntactic sugar for <userinput>-r
-
<replaceable>ARG-1</replaceable>:<replaceable>ARG</replaceable></userinput>.
- Some subcommands permit a comma-separated list of
- revision number arguments (e.g., <userinput>-c
-
<replaceable>ARG1</replaceable>,<replaceable>ARG2</replaceable>,<replaceable>ARG3</replaceable></userinput>).
- Alternatively, you can provide two arguments separated
- by a dash (as
- in <userinput>-c
<replaceable>ARG1</replaceable>-<replaceable>ARG2</replaceable></userinput>)
- to identify the range of revisions
- between <replaceable>ARG1</replaceable>
- and <replaceable>ARG2</replaceable>, inclusive.
- Finally, if the revision argument is negated, the
- implied revision range is reversed: <userinput>-c
- -45</userinput> is equivalent to <userinput>-r
- 45:44</userinput>.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.auto_props">
+ <term><option>--auto-props</option></term>
+ <listitem>
+ <para>Enables automatic property assignment (per runtime
+ configuration rules), overriding the
+ <literal>enable-auto-props</literal> runtime
+ configuration directive.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.change">
+ <term><option>--change</option> (<option>-c</option>)
<replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Perform the requested operation using a specific
+ <quote>change</quote>. Generally speaking, this option
+ is syntactic sugar for <userinput>-r
+
<replaceable>ARG-1</replaceable>:<replaceable>ARG</replaceable></userinput>.
+ Some subcommands permit a comma-separated list of
+ revision number arguments (e.g., <userinput>-c
+
<replaceable>ARG1</replaceable>,<replaceable>ARG2</replaceable>,<replaceable>ARG3</replaceable></userinput>).
+ Alternatively, you can provide two arguments separated
+ by a dash (as
+ in <userinput>-c
<replaceable>ARG1</replaceable>-<replaceable>ARG2</replaceable></userinput>)
+ to identify the range of revisions
+ between <replaceable>ARG1</replaceable>
+ and <replaceable>ARG2</replaceable>, inclusive.
+ Finally, if the revision argument is negated, the
+ implied revision range is reversed: <userinput>-c
+ -45</userinput> is equivalent to <userinput>-r
+ 45:44</userinput>.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.changelist">
- <term><option>--changelist</option> (<option>--cl</option>)
<replaceable>ARG</replaceable></term>
- <listitem>
- <para>Instructs Subversion to operate only on members of the
changelist named
- <replaceable>ARG</replaceable>. You can use this option
- multiple times to specify sets of changelists.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.changelist">
+ <term><option>--changelist</option> (<option>--cl</option>)
<replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Instructs Subversion to operate only on members of the
changelist named
+ <replaceable>ARG</replaceable>. You can use this option
+ multiple times to specify sets of changelists.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.config_dir">
- <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>
+ <varlistentry id="svn.ref.svn.sw.config_dir">
+ <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>
- <note>
- <para>This option is accepted by
- all <command>svn</command> subcommands.</para>
- </note>
- </listitem>
- </varlistentry>
+ <note>
+ <para>This option is accepted by
+ all <command>svn</command> subcommands.</para>
+ </note>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.config_option">
- <term><option>--config-option</option>
<replaceable>CONFSPEC</replaceable></term>
- <listitem>
- <para>Sets, for the duration of the command, the value of
- a runtime configuration
- option. <replaceable>CONFSPEC</replaceable> is a string
- which specifies the configuration option namespace, name
- and value that you'd like to assign, formatted as
-
<replaceable>FILE</replaceable>:<replaceable>SECTION</replaceable>:<replaceable>OPTION</replaceable>=[<replaceable>VALUE</replaceable>].
- In this syntax, <replaceable>FILE</replaceable>
- and <replaceable>SECTION</replaceable> are the runtime
- configuration file (either <literal>config</literal>
- or <literal>servers</literal>) and the section thereof,
- respectively, which contain the option whose value you
- wish to change. <replaceable>OPTION</replaceable> is,
- of course, the option itself,
- and <replaceable>VALUE</replaceable> the value (if any)
- you wish to assign to the option. For example, to
- temporarily disable the use of the automatic property
- setting feature,
- use
<option>--config-option=config:miscellany:enable-auto-props=no</option>.
- You can use this option multiple times to change
- multiple option values simultaneously.</para>
+ <varlistentry id="svn.ref.svn.sw.config_option">
+ <term><option>--config-option</option>
<replaceable>CONFSPEC</replaceable></term>
+ <listitem>
+ <para>Sets, for the duration of the command, the value of
+ a runtime configuration
+ option. <replaceable>CONFSPEC</replaceable> is a string
+ which specifies the configuration option namespace, name
+ and value that you'd like to assign, formatted as
+
<replaceable>FILE</replaceable>:<replaceable>SECTION</replaceable>:<replaceable>OPTION</replaceable>=[<replaceable>VALUE</replaceable>].
+ In this syntax, <replaceable>FILE</replaceable>
+ and <replaceable>SECTION</replaceable> are the runtime
+ configuration file (either <literal>config</literal>
+ or <literal>servers</literal>) and the section thereof,
+ respectively, which contain the option whose value you
+ wish to change. <replaceable>OPTION</replaceable> is,
+ of course, the option itself,
+ and <replaceable>VALUE</replaceable> the value (if any)
+ you wish to assign to the option. For example, to
+ temporarily disable the use of the automatic property
+ setting feature,
+ use
<option>--config-option=config:miscellany:enable-auto-props=no</option>.
+ You can use this option multiple times to change
+ multiple option values simultaneously.</para>
- <note>
- <para>This option is accepted by
- all <command>svn</command> subcommands.</para>
- </note>
- </listitem>
- </varlistentry>
+ <note>
+ <para>This option is accepted by
+ all <command>svn</command> subcommands.</para>
+ </note>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.depth">
- <term><option>--depth</option>
<replaceable>ARG</replaceable></term>
- <listitem>
- <para>Instructs Subversion to limit the scope of an
- operation to a particular tree
- depth. <replaceable>ARG</replaceable> is one of
- <literal>empty</literal> (only the target
- itself), <literal>files</literal> (the target and any
- immediate file children thereof),
- <literal>immediates</literal> (the target and any
- immediate children thereof), or
- <literal>infinity</literal> (the target and all of its
- descendants—full recursion).</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.depth">
+ <term><option>--depth</option>
<replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Instructs Subversion to limit the scope of an
+ operation to a particular tree
+ depth. <replaceable>ARG</replaceable> is one of
+ <literal>empty</literal> (only the target
+ itself), <literal>files</literal> (the target and any
+ immediate file children thereof),
+ <literal>immediates</literal> (the target and any
+ immediate children thereof), or
+ <literal>infinity</literal> (the target and all of its
+ descendants—full recursion).</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.diff">
- <term><option>--diff</option></term>
- <listitem>
- <para>Enables a special output mode for <command>svn
- log</command> which includes a difference report (a
- la <command>svn diff</command>) as part of each
- revision's information.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.diff">
+ <term><option>--diff</option></term>
+ <listitem>
+ <para>Enables a special output mode for <command>svn
+ log</command> which includes a difference report (a
+ la <command>svn diff</command>) as part of each
+ revision's information.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.diff_cmd">
- <term><option>--diff-cmd</option>
<replaceable>CMD</replaceable></term>
- <listitem>
- <para>Specifies an external program to use to show
- differences between files. When <command>svn
- diff</command> is invoked without this option, it uses
- Subversion's internal differencing engine, which provides
- unified diffs by default. If you want to use an
- external differencing program, use
<option>--diff-cmd</option>.
- You can then pass options to the specified program using the
- <option>--extensions</option> (<option>-x</option>)
- option.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.diff3_cmd">
- <term><option>--diff3-cmd</option>
<replaceable>CMD</replaceable></term>
- <listitem>
- <para>Specifies an external 3-way differencing program
- (used to merge line-based changes into files).</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.dry_run">
- <term><option>--dry-run</option></term>
- <listitem>
- <para>Goes through all the motions of running a command,
- but makes no actual changes—either on disk or in
- the repository.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.editor_cmd">
- <term><option>--editor-cmd</option>
<replaceable>CMD</replaceable></term>
- <listitem>
- <para>Specifies an external program to use to edit a log
message
- or a property value. See the <literal>editor-cmd</literal>
- section in <xref
linkend="svn.advanced.confarea.opts.config"/>
- for ways to specify a default editor.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.encoding">
- <term><option>--encoding</option>
<replaceable>ENC</replaceable></term>
- <listitem>
- <para>Tells Subversion that your commit message is
- composed using the character encoding provided. The
- default character encoding is derived from your
- operating system's native locale; use this option if
- your commit message is composed using any other
- encoding.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.diff_cmd">
+ <term><option>--diff-cmd</option>
<replaceable>CMD</replaceable></term>
+ <listitem>
+ <para>Specifies an external program to use to show
+ differences between files. When <command>svn
+ diff</command> is invoked without this option, it uses
+ Subversion's internal differencing engine, which provides
+ unified diffs by default. If you want to use an
+ external differencing program, use <option>--diff-cmd</option>.
+ You can then pass options to the specified program using the
+ <option>--extensions</option> (<option>-x</option>)
+ option.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.diff3_cmd">
+ <term><option>--diff3-cmd</option>
<replaceable>CMD</replaceable></term>
+ <listitem>
+ <para>Specifies an external 3-way differencing program
+ (used to merge line-based changes into files).</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.dry_run">
+ <term><option>--dry-run</option></term>
+ <listitem>
+ <para>Goes through all the motions of running a command,
+ but makes no actual changes—either on disk or in
+ the repository.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.editor_cmd">
+ <term><option>--editor-cmd</option>
<replaceable>CMD</replaceable></term>
+ <listitem>
+ <para>Specifies an external program to use to edit a log message
+ or a property value. See the <literal>editor-cmd</literal>
+ section in <xref linkend="svn.advanced.confarea.opts.config"/>
+ for ways to specify a default editor.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.encoding">
+ <term><option>--encoding</option>
<replaceable>ENC</replaceable></term>
+ <listitem>
+ <para>Tells Subversion that your commit message is
+ composed using the character encoding provided. The
+ default character encoding is derived from your
+ operating system's native locale; use this option if
+ your commit message is composed using any other
+ encoding.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.extensions">
- <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>--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>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.extensions">
+ <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>--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>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.file">
- <term><option>--file</option> (<option>-F</option>)
<replaceable>FILENAME</replaceable></term>
- <listitem>
- <para>Uses the contents of the named file for the
- specified subcommand. Different subcommands do
- different things with this content. For example,
- <command>svn commit</command> uses the content as a
- commit log message, whereas <command>svn
- propset</command> uses it as a property value.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.file">
+ <term><option>--file</option> (<option>-F</option>)
<replaceable>FILENAME</replaceable></term>
+ <listitem>
+ <para>Uses the contents of the named file for the
+ specified subcommand. Different subcommands do
+ different things with this content. For example,
+ <command>svn commit</command> uses the content as a
+ commit log message, whereas <command>svn
+ propset</command> uses it as a property value.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.force">
- <term><option>--force</option></term>
- <listitem>
- <para>Forces a particular command or operation to run.
- Subversion will prevent you from performing some
- operations in normal usage, but you can pass this option
- to tell Subversion <quote>I know what I'm doing as well
- as the possible repercussions of doing it, so let me at
- 'em.</quote> This option is the programmatic equivalent
- of doing your own electrical work with the power
- on—if you don't know what you're doing, you're
- likely to get a nasty shock.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.force_log">
- <term><option>--force-log</option></term>
- <listitem>
- <para>Forces a suspicious parameter passed to the
- <option>--message</option> (<option>-m</option>) or
- <option>--file</option> (<option>-F</option>) option to
- be accepted as valid. By default, Subversion will
- produce an error if parameters to these options look
- like they might instead be targets of the subcommand.
- For example, if you pass a versioned file's path to the
- <option>--file</option> (<option>-F</option>) option,
- Subversion will assume you've made a mistake, that the
- path was instead intended as the target of the
- operation, and that you simply failed to provide some
- other—unversioned—file as the source of your
- log message. To assert your intent and override these
- types of errors, pass the <option>--force-log</option>
- option to subcommands that accept log messages.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.force">
+ <term><option>--force</option></term>
+ <listitem>
+ <para>Forces a particular command or operation to run.
+ Subversion will prevent you from performing some
+ operations in normal usage, but you can pass this option
+ to tell Subversion <quote>I know what I'm doing as well
+ as the possible repercussions of doing it, so let me at
+ 'em.</quote> This option is the programmatic equivalent
+ of doing your own electrical work with the power
+ on—if you don't know what you're doing, you're
+ likely to get a nasty shock.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.force_log">
+ <term><option>--force-log</option></term>
+ <listitem>
+ <para>Forces a suspicious parameter passed to the
+ <option>--message</option> (<option>-m</option>) or
+ <option>--file</option> (<option>-F</option>) option to
+ be accepted as valid. By default, Subversion will
+ produce an error if parameters to these options look
+ like they might instead be targets of the subcommand.
+ For example, if you pass a versioned file's path to the
+ <option>--file</option> (<option>-F</option>) option,
+ Subversion will assume you've made a mistake, that the
+ path was instead intended as the target of the
+ operation, and that you simply failed to provide some
+ other—unversioned—file as the source of your
+ log message. To assert your intent and override these
+ types of errors, pass the <option>--force-log</option>
+ option to subcommands that accept log messages.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.git">
- <term><option>--git</option></term>
- <listitem>
- <para>Enables a special output mode for <command>svn
- diff</command> designed for cross-compatibility with the
- popular Git distributed version control system.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.git">
+ <term><option>--git</option></term>
+ <listitem>
+ <para>Enables a special output mode for <command>svn
+ diff</command> designed for cross-compatibility with the
+ popular Git distributed version control system.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.help">
- <term><option>--help</option> (<option>-h</option>,
<option>-?</option>)</term>
- <listitem>
- <para>If used with one or more subcommands, shows the
- built-in help text for each. If used alone, it displays
- the general client help text.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.ignore_ancestry">
- <term><option>--ignore-ancestry</option></term>
- <listitem>
- <para>Tells Subversion to ignore ancestry when calculating
- differences (rely on path contents alone). Also disables
- <xref linkend="svn.branchmerge.basicmerging.mergetracking"/>
- when used with the <command>svn merge</command> subcommand.
- </para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.help">
+ <term><option>--help</option> (<option>-h</option>,
<option>-?</option>)</term>
+ <listitem>
+ <para>If used with one or more subcommands, shows the
+ built-in help text for each. If used alone, it displays
+ the general client help text.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.ignore_externals">
- <term><option>--ignore-externals</option></term>
- <listitem>
- <para>Tells Subversion to ignore externals definitions and
- the external working copies managed by them.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.ignore_keywords">
- <term><option>--ignore-keywords</option></term>
- <listitem>
- <para>Disables keyword expansion.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.ignore_ancestry">
+ <term><option>--ignore-ancestry</option></term>
+ <listitem>
+ <para>Tells Subversion to ignore ancestry when calculating
+ differences (rely on path contents alone). Also disables
+ <xref linkend="svn.branchmerge.basicmerging.mergetracking"/>
+ when used with the <command>svn merge</command> subcommand.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.ignore_externals">
+ <term><option>--ignore-externals</option></term>
+ <listitem>
+ <para>Tells Subversion to ignore externals definitions and
+ the external working copies managed by them.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.ignore_keywords">
+ <term><option>--ignore-keywords</option></term>
+ <listitem>
+ <para>Disables keyword expansion.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.ignore_whitespace">
- <term><option>--ignore-whitespace</option></term>
- <listitem>
- <para>Instructs <command>svn patch</command> to ignore
- whitespace when attempting to identify patch
- context.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.ignore_whitespace">
+ <term><option>--ignore-whitespace</option></term>
+ <listitem>
+ <para>Instructs <command>svn patch</command> to ignore
+ whitespace when attempting to identify patch
+ context.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.incremental">
- <term><option>--incremental</option></term>
- <listitem>
- <para>Prints output in a format suitable for
- concatenation to prior similar output.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.internal_diff">
- <term><option>--internal-diff</option></term>
- <listitem>
- <para>Instructs Subversion to use its built-in
- differencing engine despite any external differencing
- mechanism that may be specified for use in the user's
- runtime configuration.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.incremental">
+ <term><option>--incremental</option></term>
+ <listitem>
+ <para>Prints output in a format suitable for
+ concatenation to prior similar output.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.internal_diff">
+ <term><option>--internal-diff</option></term>
+ <listitem>
+ <para>Instructs Subversion to use its built-in
+ differencing engine despite any external differencing
+ mechanism that may be specified for use in the user's
+ runtime configuration.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.keep_changelists">
- <term><option>--keep-changelists</option></term>
- <listitem>
- <para>Tells Subversion not to remove the changelist assigments
- from working copy items after committing.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svn.sw.keep_changelists">
+ <term><option>--keep-changelists</option></term>
+ <listitem>
+ <para>Tells Subversion not to remove the changelist assigments
+ from working copy items after committing.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.keep_local">
+ <term><option>--keep-local</option></term>
+ <listitem>
+ <para>Keeps the local copy of a file or directory (used
+ with the <command>svn delete</command> command).</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.limit">
+ <term><option>--limit</option> (<option>-l</option>)
<replaceable>NUM</replaceable></term>
+ <listitem>
+ <para>Shows only the first <replaceable>NUM</replaceable>
+ log messages.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svn.sw.keep_local">
- <term><option>--keep-local</option></term>
- <listitem>
- <para>Keeps the local copy of a file or directory (used
- with the <command>svn delete</command> command).</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.limit">
- <term><option>--limit</option> (<option>-l</option>)
<replaceable>NUM</replaceable></term>
- <listitem>
- <para>Shows only the first <replaceable>NUM</replaceable>
- log messages.</para>
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/en/book/ref-svnsync.xml Thu Feb 7 12:43:50 2013
+++ /trunk/en/book/ref-svnsync.xml Tue Feb 12 12:02:17 2013
@@ -29,252 +29,252 @@
process permitted to modify the mirror repository.</para>
</warning>
- <para>Options in <command>svnsync</command> are global, just
- as they are in <command>svn</command> and
- <command>svnadmin</command>:</para>
+ <para>Options in <command>svnsync</command> are global, just
+ as they are in <command>svn</command> and
+ <command>svnadmin</command>:</para>
- <variablelist id="svn.ref.svnsync.sw">
- <title>svnsync Options</title>
+ <variablelist id="svn.ref.svnsync.sw">
+ <title>svnsync Options</title>
- <varlistentry id="svn.ref.svnsync.sw.allow_non_empty">
- <term><option>--allow-non-empty</option></term>
- <listitem>
- <para>Disables the verification (which <command>svnsync
- initialize</command> performs by default) that the
- repository being initialized is empty of history
- version.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.allow_non_empty">
+ <term><option>--allow-non-empty</option></term>
+ <listitem>
+ <para>Disables the verification (which <command>svnsync
+ initialize</command> performs by default) that the
+ repository being initialized is empty of history
+ version.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.config_dir">
- <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 id="svn.ref.svnsync.sw.config_dir">
+ <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 id="svn.ref.svnsync.sw.config_option">
- <term><option>--config-option</option>
<replaceable>CONFSPEC</replaceable></term>
- <listitem>
- <para>Sets, for the duration of the command, the value of
- a runtime configuration
- option. <replaceable>CONFSPEC</replaceable> is a string
- which specifies the configuration option namespace, name
- and value that you'd like to assign, formatted as
-
<replaceable>FILE</replaceable>:<replaceable>SECTION</replaceable>:<replaceable>OPTION</replaceable>=[<replaceable>VALUE</replaceable>].
- In this syntax, <replaceable>FILE</replaceable>
- and <replaceable>SECTION</replaceable> are the runtime
- configuration file (either <literal>config</literal>
- or <literal>servers</literal>) and the section thereof,
- respectively, which contain the option whose value you
- wish to change. <replaceable>OPTION</replaceable> is,
- of course, the option itself,
- and <replaceable>VALUE</replaceable> the value (if any)
- you wish to assign to the option. For example, to
- temporarily disable the use of the automatic property
- setting feature,
- use
<option>--config-option=servers:global:http-library=serf</option>.
- You can use this option multiple times to change
- multiple option values simultaneously.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.config_option">
+ <term><option>--config-option</option>
<replaceable>CONFSPEC</replaceable></term>
+ <listitem>
+ <para>Sets, for the duration of the command, the value of
+ a runtime configuration
+ option. <replaceable>CONFSPEC</replaceable> is a string
+ which specifies the configuration option namespace, name
+ and value that you'd like to assign, formatted as
+
<replaceable>FILE</replaceable>:<replaceable>SECTION</replaceable>:<replaceable>OPTION</replaceable>=[<replaceable>VALUE</replaceable>].
+ In this syntax, <replaceable>FILE</replaceable>
+ and <replaceable>SECTION</replaceable> are the runtime
+ configuration file (either <literal>config</literal>
+ or <literal>servers</literal>) and the section thereof,
+ respectively, which contain the option whose value you
+ wish to change. <replaceable>OPTION</replaceable> is,
+ of course, the option itself,
+ and <replaceable>VALUE</replaceable> the value (if any)
+ you wish to assign to the option. For example, to
+ temporarily disable the use of the automatic property
+ setting feature,
+ use
<option>--config-option=servers:global:http-library=serf</option>.
+ You can use this option multiple times to change
+ multiple option values simultaneously.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.disable_locking">
- <term><option>--disable-locking</option></term>
- <listitem>
- <para>Causes <command>svnsync</command> to bypass its own
- exclusive access mechanisms and operate on the
- assumption that its exclusive access to the mirror
- repository is being guaranteed through some other,
- out-of-band mechanism.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.disable_locking">
+ <term><option>--disable-locking</option></term>
+ <listitem>
+ <para>Causes <command>svnsync</command> to bypass its own
+ exclusive access mechanisms and operate on the
+ assumption that its exclusive access to the mirror
+ repository is being guaranteed through some other,
+ out-of-band mechanism.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.no_auth_cache">
- <term><option>--no-auth-cache</option></term>
- <listitem>
- <para>Prevents caching of authentication information
- (e.g., username and password) in the Subversion
- runtime configuration directories.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.no_auth_cache">
+ <term><option>--no-auth-cache</option></term>
+ <listitem>
+ <para>Prevents caching of authentication information
+ (e.g., username and password) in the Subversion
+ runtime configuration directories.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.non_interactive">
- <term><option>--non-interactive</option></term>
- <listitem>
- <para>In the case of an authentication failure or
- insufficient credentials, prevents prompting for
- credentials (e.g., username or password). This is useful
- if you're running Subversion inside an automated
- script and it's more appropriate to have Subversion fail
- than to prompt for more information.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.non_interactive">
+ <term><option>--non-interactive</option></term>
+ <listitem>
+ <para>In the case of an authentication failure or
+ insufficient credentials, prevents prompting for
+ credentials (e.g., username or password). This is useful
+ if you're running Subversion inside an automated
+ script and it's more appropriate to have Subversion fail
+ than to prompt for more information.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.quiet">
- <term><option>--quiet</option> (<option>-q</option>)</term>
- <listitem>
- <para>Requests that the client print only essential
- information while performing an operation.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.quiet">
+ <term><option>--quiet</option> (<option>-q</option>)</term>
+ <listitem>
+ <para>Requests that the client print only essential
+ information while performing an operation.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.revision">
- <term><option>--revision</option> (<option>-r</option>)
<replaceable>ARG</replaceable></term>
- <listitem>
- <para>Used by <command>svnsync copy-revprops</command> to
- specify a particular revision or revision range on which
- to operate.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.revision">
+ <term><option>--revision</option> (<option>-r</option>)
<replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Used by <command>svnsync copy-revprops</command> to
+ specify a particular revision or revision range on which
+ to operate.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.source_password">
- <term><option>--source-password</option>
<replaceable>PASSWD</replaceable></term>
- <listitem>
- <para>Specifies the password for the Subversion server
- from which you are syncing. If not provided, or if
- incorrect, Subversion will prompt you for this
- information as needed.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.source_password">
+ <term><option>--source-password</option>
<replaceable>PASSWD</replaceable></term>
+ <listitem>
+ <para>Specifies the password for the Subversion server
+ from which you are syncing. If not provided, or if
+ incorrect, Subversion will prompt you for this
+ information as needed.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.source_prop_encoding ">
- <term><option>--source-prop-encoding
<replaceable>ARG</replaceable></option></term>
- <listitem>
- <para>Instructs <command>svnsync</command> to assume that
- translatable Subversion revision properties found in the
- source repository are stored using the character
- encoding <replaceable>ARG</replaceable> and to transcode
- those into UTF-8 when copying them into the mirror
- repository.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.source_prop_encoding ">
+ <term><option>--source-prop-encoding
<replaceable>ARG</replaceable></option></term>
+ <listitem>
+ <para>Instructs <command>svnsync</command> to assume that
+ translatable Subversion revision properties found in the
+ source repository are stored using the character
+ encoding <replaceable>ARG</replaceable> and to transcode
+ those into UTF-8 when copying them into the mirror
+ repository.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.source_username">
- <term><option>--source-username</option>
<replaceable>NAME</replaceable></term>
- <listitem>
- <para>Specifies the username for the Subversion server
- from which you are syncing. If not provided, or if
- incorrect, Subversion will prompt you for this
- information as needed.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.source_username">
+ <term><option>--source-username</option>
<replaceable>NAME</replaceable></term>
+ <listitem>
+ <para>Specifies the username for the Subversion server
+ from which you are syncing. If not provided, or if
+ incorrect, Subversion will prompt you for this
+ information as needed.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.steal_lock">
- <term><option>--steal-lock</option></term>
- <listitem>
- <para>Causes <command>svnsync</command> to steal, as
- necessary, the lock which it uses on the mirror
- repository to ensure exclusive repository access. (This
- option should only be used when a lock exists in the
- mirror repository and is known to be stale—that
- is, when you are certain that there are no
- other <command>svnsync</command> processes accessing
- that repository.)</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svnsync.sw.sync_password">
- <term><option>--sync-password</option>
<replaceable>PASSWD</replaceable></term>
- <listitem>
- <para>Specifies the password for the Subversion server to
- which you are syncing. If not provided, or if
- incorrect, Subversion will prompt you for this
- information as needed.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svnsync.sw.sync_username">
- <term><option>--sync-username</option>
<replaceable>NAME</replaceable></term>
- <listitem>
- <para>Specifies the username for the Subversion server to
- which you are syncing. If not provided, or if
- incorrect, Subversion will prompt you for this
- information as needed.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.steal_lock">
+ <term><option>--steal-lock</option></term>
+ <listitem>
+ <para>Causes <command>svnsync</command> to steal, as
+ necessary, the lock which it uses on the mirror
+ repository to ensure exclusive repository access. (This
+ option should only be used when a lock exists in the
+ mirror repository and is known to be stale—that
+ is, when you are certain that there are no
+ other <command>svnsync</command> processes accessing
+ that repository.)</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svnsync.sw.sync_password">
+ <term><option>--sync-password</option>
<replaceable>PASSWD</replaceable></term>
+ <listitem>
+ <para>Specifies the password for the Subversion server to
+ which you are syncing. If not provided, or if
+ incorrect, Subversion will prompt you for this
+ information as needed.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svnsync.sw.sync_username">
+ <term><option>--sync-username</option>
<replaceable>NAME</replaceable></term>
+ <listitem>
+ <para>Specifies the username for the Subversion server to
+ which you are syncing. If not provided, or if
+ incorrect, Subversion will prompt you for this
+ information as needed.</para>
+ </listitem>
+ </varlistentry>
- <varlistentry id="svn.ref.svnsync.sw.trust_server_cert">
- <term><option>--trust-server-cert</option></term>
- <listitem>
- <para>Used with <option>--non-interactive</option> to accept
- any unknown SSL server certificates without prompting.</para>
- </listitem>
- </varlistentry>
+ <varlistentry id="svn.ref.svnsync.sw.trust_server_cert">
+ <term><option>--trust-server-cert</option></term>
+ <listitem>
+ <para>Used with <option>--non-interactive</option> to accept
+ any unknown SSL server certificates without prompting.</para>
+ </listitem>
+ </varlistentry>
- </variablelist>
+ </variablelist>
</partintro>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
- <refentry id="svn.ref.svnsync.c.copy-revprops">
+ <!-- =============================================================== -->
+ <refentry id="svn.ref.svnsync.c.copy-revprops">
- <indexterm>
- <primary>svnsync</primary>
- <secondary>subcommands</secondary>
- <tertiary>copy-revprops</tertiary>
- </indexterm>
+ <indexterm>
+ <primary>svnsync</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>copy-revprops</tertiary>
+ </indexterm>
- <refnamediv>
- <refname>svnsync copy-revprops</refname>
- <refpurpose>Copy all revision properties for a particular
- revision (or range of revisions) from the source
- repository to the mirror repository.</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Synopsis</title>
- <para><literal>svnsync copy-revprops DEST_URL
- [SOURCE_URL]</literal></para>
- <para><literal>svnsync copy-revprops DEST_URL
- REV[:REV2]</literal></para>
- </refsect1>
- <refsect1>
- <title>Description</title>
+ <refnamediv>
+ <refname>svnsync copy-revprops</refname>
+ <refpurpose>Copy all revision properties for a particular
+ revision (or range of revisions) from the source
+ repository to the mirror repository.</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Synopsis</title>
+ <para><literal>svnsync copy-revprops DEST_URL
+ [SOURCE_URL]</literal></para>
+ <para><literal>svnsync copy-revprops DEST_URL
+ REV[:REV2]</literal></para>
+ </refsect1>
+ <refsect1>
+ <title>Description</title>
- <para>Because Subversion revision properties can be changed
- at any time, it's possible that the properties for some
- revision might be changed after that revision has already
- been synchronized to another repository. Because the
- <command>svnsync synchronize</command> command operates
- only on the range of revisions that have not yet been
- synchronized, it won't notice a revision property change
- outside that range. Left as is, this causes a deviation
- in the values of that revision's properties between the
- source and mirror repositories. <command>svnsync
- copy-revprops</command> is the answer to this problem.
- Use it to resynchronize the revision properties for a
- particular revision or range of revisions.</para>
+ <para>Because Subversion revision properties can be changed
+ at any time, it's possible that the properties for some
+ revision might be changed after that revision has already
+ been synchronized to another repository. Because the
+ <command>svnsync synchronize</command> command operates
+ only on the range of revisions that have not yet been
+ synchronized, it won't notice a revision property change
+ outside that range. Left as is, this causes a deviation
+ in the values of that revision's properties between the
+ source and mirror repositories. <command>svnsync
+ copy-revprops</command> is the answer to this problem.
+ Use it to resynchronize the revision properties for a
+ particular revision or range of revisions.</para>
- <para>When <replaceable>SOURCE_URL</replaceable> is
- provided, <command>svnsync</command> will use it as the
- repository URL which the destination repository is
- mirroring. Generally, <replaceable>SOURCE_URL</replaceable>
- will be exactly the same source URL as was used with
- the <command>svnsync initialize</command> command when the
- mirror was first set up. You may choose, however, to
- omit <replaceable>SOURCE_URL</replaceable>, in which
- case <command>svnsync</command> will consult the mirror
- repository's records to determine the source URL which
- should be used.</para>
+ <para>When <replaceable>SOURCE_URL</replaceable> is
+ provided, <command>svnsync</command> will use it as the
+ repository URL which the destination repository is
+ mirroring. Generally, <replaceable>SOURCE_URL</replaceable>
+ will be exactly the same source URL as was used with
+ the <command>svnsync initialize</command> command when the
+ mirror was first set up. You may choose, however, to
+ omit <replaceable>SOURCE_URL</replaceable>, in which
+ case <command>svnsync</command> will consult the mirror
+ repository's records to determine the source URL which
+ should be used.</para>
- <warning>
- <para>We strongly recommend that you specify the source
- URL on the command-line, especially when untrusted users
- have write access to the revision 0 properties
- which <command>svnsync</command> uses to coordinate its
- efforts.</para>
- </warning>
+ <warning>
+ <para>We strongly recommend that you specify the source
+ URL on the command-line, especially when untrusted users
+ have write access to the revision 0 properties
+ which <command>svnsync</command> uses to coordinate its
+ efforts.</para>
+ </warning>
- </refsect1>
+ </refsect1>
- <refsect1>
- <title>Options</title>
+ <refsect1>
+ <title>Options</title>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
<xref linkend="svn.ref.svnsync.sw.config_dir" />
<xref linkend="svn.ref.svnsync.sw.config_option" />
<xref linkend="svn.ref.svnsync.sw.disable_locking" />
@@ -290,95 +290,95 @@
<xref linkend="svn.ref.svnsync.sw.sync_username" />
<xref linkend="svn.ref.svnsync.sw.trust_server_cert" />
</screen>
- </informalexample>
- </refsect1>
+ </informalexample>
+ </refsect1>
- <refsect1>
- <title>Examples</title>
+ <refsect1>
+ <title>Examples</title>
- <para>Resynchronize the revision properties associated with
- a single revision (r6):</para>
+ <para>Resynchronize the revision properties associated with
+ a single revision (r6):</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnsync copy-revprops -r 6 file:///var/svn/repos-mirror \
http://svn.example.com/repos
Copied properties for revision 6.
$
</screen>
- </informalexample>
+ </informalexample>
- </refsect1>
- </refentry>
+ </refsect1>
+ </refentry>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
- <refentry id="svn.ref.svnsync.c.help">
+ <!-- =============================================================== -->
+ <refentry id="svn.ref.svnsync.c.help">
- <indexterm>
- <primary>svnsync</primary>
- <secondary>subcommands</secondary>
- <tertiary>help</tertiary>
- </indexterm>
+ <indexterm>
+ <primary>svnsync</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>help</tertiary>
+ </indexterm>
- <refnamediv>
- <refname>svnsync help</refname>
- <refpurpose>Help!</refpurpose>
- </refnamediv>
- <refsect1>
+ <refnamediv>
+ <refname>svnsync help</refname>
+ <refpurpose>Help!</refpurpose>
+ </refnamediv>
+ <refsect1>
- <title>Synopsis</title>
- <para><literal>svnsync help</literal></para>
- </refsect1>
- <refsect1>
- <title>Description</title>
+ <title>Synopsis</title>
+ <para><literal>svnsync help</literal></para>
+ </refsect1>
+ <refsect1>
+ <title>Description</title>
- <para>This subcommand is useful when you're trapped in a
- foreign prison with neither a Net connection nor a copy of
- this book, but you do have a local Wi-Fi network running
- and you'd like to sync a copy of your repository over to
- the backup server that Ira The Knife is running over in
- cell block D.</para>
-
- </refsect1>
+ <para>This subcommand is useful when you're trapped in a
+ foreign prison with neither a Net connection nor a copy of
+ this book, but you do have a local Wi-Fi network running
+ and you'd like to sync a copy of your repository over to
+ the backup server that Ira The Knife is running over in
+ cell block D.</para>
+
+ </refsect1>
- <refsect1>
- <title>Options</title>
- <para>None</para>
- </refsect1>
+ <refsect1>
+ <title>Options</title>
+ <para>None</para>
+ </refsect1>
- </refentry>
+ </refentry>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
- <refentry id="svn.ref.svnsync.c.info">
+ <!-- =============================================================== -->
+ <refentry id="svn.ref.svnsync.c.info">
- <indexterm>
- <primary>svnsync</primary>
- <secondary>subcommands</secondary>
- <tertiary>info</tertiary>
- </indexterm>
+ <indexterm>
+ <primary>svnsync</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>info</tertiary>
+ </indexterm>
- <refnamediv>
- <refname>svnsync info</refname>
- <refpurpose>Print information about the synchronization
- of a destination repository.</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Synopsis</title>
- <para><literal>svnsync info DEST_URL</literal></para>
- </refsect1>
- <refsect1>
- <title>Description</title>
-
- <para>Print the synchronization source URL, source repository
- UUID and the last revision merged from the source to the
- destination repository at
<replaceable>DEST_URL</replaceable>.</para>
- </refsect1>
-
- <refsect1>
- <title>Options</title>
+ <refnamediv>
+ <refname>svnsync info</refname>
+ <refpurpose>Print information about the synchronization
+ of a destination repository.</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Synopsis</title>
+ <para><literal>svnsync info DEST_URL</literal></para>
+ </refsect1>
+ <refsect1>
+ <title>Description</title>
+
+ <para>Print the synchronization source URL, source repository
+ UUID and the last revision merged from the source to the
+ destination repository at
<replaceable>DEST_URL</replaceable>.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Options</title>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
<xref linkend="svn.ref.svnsync.sw.config_dir" />
<xref linkend="svn.ref.svnsync.sw.config_option" />
<xref linkend="svn.ref.svnsync.sw.no_auth_cache" />
@@ -389,96 +389,96 @@
<xref linkend="svn.ref.svnsync.sw.sync_username" />
<xref linkend="svn.ref.svnsync.sw.trust_server_cert" />
</screen>
- </informalexample>
- </refsect1>
+ </informalexample>
+ </refsect1>
- <refsect1>
- <title>Examples</title>
+ <refsect1>
+ <title>Examples</title>
- <para>Print the synchronization information of a mirror
- repository:</para>
+ <para>Print the synchronization information of a mirror
+ repository:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnsync info file:///var/svn/repos-mirror
Source URL: http://svn.example.com/repos
Source Repository UUID: e7fe1b91-8cd5-0310-98dd-2f12e793c5e8
Last Merged Revision: 47
$
</screen>
- </informalexample>
+ </informalexample>
- </refsect1>
- </refentry>
+ </refsect1>
+ </refentry>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
- <refentry id="svn.ref.svnsync.c.init">
+ <!-- =============================================================== -->
+ <refentry id="svn.ref.svnsync.c.init">
- <indexterm>
- <primary>svnsync</primary>
- <secondary>subcommands</secondary>
- <tertiary>initialize</tertiary>
- </indexterm>
+ <indexterm>
+ <primary>svnsync</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>initialize</tertiary>
+ </indexterm>
- <refnamediv>
- <refname>svnsync initialize (init)</refname>
- <refpurpose>Initialize a mirror repository for
- synchronization from the source repository.</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Synopsis</title>
- <para><literal>svnsync initialize MIRROR_URL
- SOURCE_URL</literal></para>
- </refsect1>
- <refsect1>
- <title>Description</title>
+ <refnamediv>
+ <refname>svnsync initialize (init)</refname>
+ <refpurpose>Initialize a mirror repository for
+ synchronization from the source repository.</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Synopsis</title>
+ <para><literal>svnsync initialize MIRROR_URL
+ SOURCE_URL</literal></para>
+ </refsect1>
+ <refsect1>
+ <title>Description</title>
- <para><command>svnsync initialize</command> verifies that a
- repository meets the basic requirements of a new mirror
- repository and records the initial administrative
- information that associates the mirror repository with the
- source repository (specified
- by <replaceable>SOURCE_URL</replaceable>). This is the
- first <command>svnsync</command> operation you run on a
- would-be mirror repository.</para>
+ <para><command>svnsync initialize</command> verifies that a
+ repository meets the basic requirements of a new mirror
+ repository and records the initial administrative
+ information that associates the mirror repository with the
+ source repository (specified
+ by <replaceable>SOURCE_URL</replaceable>). This is the
+ first <command>svnsync</command> operation you run on a
+ would-be mirror repository.</para>
- <para>Ordinarily, <replaceable>SOURCE_URL</replaceable> is
- the URL of the root directory of the Subversion repository
- you wish to mirror. Subversion 1.5 and newer allow you to
- use <command>svnsync</command> for partial repository
- mirroring, though — simply specify the URL of the
- source repository subdirectory you wish to mirror
- as <replaceable>SOURCE_URL</replaceable>.</para>
+ <para>Ordinarily, <replaceable>SOURCE_URL</replaceable> is
+ the URL of the root directory of the Subversion repository
+ you wish to mirror. Subversion 1.5 and newer allow you to
+ use <command>svnsync</command> for partial repository
+ mirroring, though — simply specify the URL of the
+ source repository subdirectory you wish to mirror
+ as <replaceable>SOURCE_URL</replaceable>.</para>
- <para>By default, the aforementioned basic requirements of a
- mirror are that it allows revision property modifications
- and that it contains no version history. However, as of
- Subversion 1.7, you may now optionally disable the
- verification that the target repository is empty using
- the <option>--allow-non-empty</option> option. While the
- use of this option should not become habitual (as it
- bypasses a valuable safeguard mechanism), it does aid in
- one very common use-case: initializing a copy of a
- repository as a mirror of the original. This is
- especially handy when setting up new mirrors of
- repositories which contain a large amount of version
- history. Rather than initialize a brand new repository as
- a mirror and then syncronize all of the history into it,
- administrators will find it <emphasis>significantly</emphasis>
- faster to first make a copy of the mature repository
- (perhaps using <command>svnadmin hotcopy</command>) and
- then use <command>svnsync initialize
- --allow-non-empty</command> to initialize that copy as a
- mirror which is now already up-to-date with the
- original.</para>
+ <para>By default, the aforementioned basic requirements of a
+ mirror are that it allows revision property modifications
+ and that it contains no version history. However, as of
+ Subversion 1.7, you may now optionally disable the
+ verification that the target repository is empty using
+ the <option>--allow-non-empty</option> option. While the
+ use of this option should not become habitual (as it
+ bypasses a valuable safeguard mechanism), it does aid in
+ one very common use-case: initializing a copy of a
+ repository as a mirror of the original. This is
+ especially handy when setting up new mirrors of
+ repositories which contain a large amount of version
+ history. Rather than initialize a brand new repository as
+ a mirror and then syncronize all of the history into it,
+ administrators will find it <emphasis>significantly</emphasis>
+ faster to first make a copy of the mature repository
+ (perhaps using <command>svnadmin hotcopy</command>) and
+ then use <command>svnsync initialize
+ --allow-non-empty</command> to initialize that copy as a
+ mirror which is now already up-to-date with the
+ original.</para>
- </refsect1>
+ </refsect1>
- <refsect1>
- <title>Options</title>
+ <refsect1>
+ <title>Options</title>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
<xref linkend="svn.ref.svnsync.sw.allow_non_empty" />
<xref linkend="svn.ref.svnsync.sw.config_dir" />
<xref linkend="svn.ref.svnsync.sw.config_option" />
@@ -494,100 +494,100 @@
<xref linkend="svn.ref.svnsync.sw.sync_username" />
<xref linkend="svn.ref.svnsync.sw.trust_server_cert" />
</screen>
- </informalexample>
- </refsect1>
+ </informalexample>
+ </refsect1>
- <refsect1>
- <title>Examples</title>
+ <refsect1>
+ <title>Examples</title>
- <para>Fail to initialize a mirror repository due to
- inability to modify revision properties:</para>
+ <para>Fail to initialize a mirror repository due to
+ inability to modify revision properties:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnsync initialize file:///var/svn/repos-mirror \
http://svn.example.com/repos
svnsync: Repository has not been enabled to accept revision propchanges;
ask the administrator to create a pre-revprop-change hook
$
</screen>
- </informalexample>
+ </informalexample>
- <para>Initialize a repository as a mirror, having already
- created a <literal>pre-revprop-change</literal> hook that
- permits all revision property changes:</para>
+ <para>Initialize a repository as a mirror, having already
+ created a <literal>pre-revprop-change</literal> hook that
+ permits all revision property changes:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnsync initialize file:///var/svn/repos-mirror \
http://svn.example.com/repos
Copied properties for revision 0.
$
</screen>
- </informalexample>
+ </informalexample>
- </refsect1>
- </refentry>
+ </refsect1>
+ </refentry>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
- <refentry id="svn.ref.svnsync.c.sync">
+ <!-- =============================================================== -->
+ <refentry id="svn.ref.svnsync.c.sync">
- <indexterm>
- <primary>svnsync</primary>
- <secondary>subcommands</secondary>
- <tertiary>synchronize</tertiary>
- </indexterm>
+ <indexterm>
+ <primary>svnsync</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>synchronize</tertiary>
+ </indexterm>
- <refnamediv>
- <refname>svnsync synchronize (sync)</refname>
- <refpurpose>Transfer all pending revisions from the source
- repository to the mirror repository.</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Synopsis</title>
- <para><literal>svnsync synchronize DEST_URL
- [SOURCE_URL]</literal></para>
- </refsect1>
- <refsect1>
- <title>Description</title>
+ <refnamediv>
+ <refname>svnsync synchronize (sync)</refname>
+ <refpurpose>Transfer all pending revisions from the source
+ repository to the mirror repository.</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Synopsis</title>
+ <para><literal>svnsync synchronize DEST_URL
+ [SOURCE_URL]</literal></para>
+ </refsect1>
+ <refsect1>
+ <title>Description</title>
- <para>The <command>svnsync synchronize</command> command
- does all the heavy lifting of a repository mirroring
- operation. After consulting with the mirror repository to
- see which revisions have already been copied into it, it
- then begins to copy any not-yet-mirrored revisions from
- the source repository.</para>
+ <para>The <command>svnsync synchronize</command> command
+ does all the heavy lifting of a repository mirroring
+ operation. After consulting with the mirror repository to
+ see which revisions have already been copied into it, it
+ then begins to copy any not-yet-mirrored revisions from
+ the source repository.</para>
- <para><command>svnsync synchronize</command> can be
- gracefully canceled and restarted.</para>
+ <para><command>svnsync synchronize</command> can be
+ gracefully canceled and restarted.</para>
- <para>When <replaceable>SOURCE_URL</replaceable> is
- provided, <command>svnsync</command> will use it as the
- repository URL which the destination repository is
- mirroring. Generally, <replaceable>SOURCE_URL</replaceable>
- will be exactly the same source URL as was used with
- the <command>svnsync initialize</command> command when the
- mirror was first set up. You may choose, however, to
- omit <replaceable>SOURCE_URL</replaceable>, in which
- case <command>svnsync</command> will consult the mirror
- repository's records to determine the source URL which
- should be used.</para>
+ <para>When <replaceable>SOURCE_URL</replaceable> is
+ provided, <command>svnsync</command> will use it as the
+ repository URL which the destination repository is
+ mirroring. Generally, <replaceable>SOURCE_URL</replaceable>
+ will be exactly the same source URL as was used with
+ the <command>svnsync initialize</command> command when the
+ mirror was first set up. You may choose, however, to
+ omit <replaceable>SOURCE_URL</replaceable>, in which
+ case <command>svnsync</command> will consult the mirror
+ repository's records to determine the source URL which
+ should be used.</para>
- <warning>
- <para>We strongly recommend that you specify the source
- URL on the command-line, especially when untrusted users
- have write access to the revision 0 properties
- which <command>svnsync</command> uses to coordinate its
- efforts.</para>
- </warning>
+ <warning>
+ <para>We strongly recommend that you specify the source
+ URL on the command-line, especially when untrusted users
+ have write access to the revision 0 properties
+ which <command>svnsync</command> uses to coordinate its
+ efforts.</para>
+ </warning>
- </refsect1>
+ </refsect1>
- <refsect1>
- <title>Options</title>
+ <refsect1>
+ <title>Options</title>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
<xref linkend="svn.ref.svnsync.sw.config_dir" />
<xref linkend="svn.ref.svnsync.sw.config_option" />
<xref linkend="svn.ref.svnsync.sw.disable_locking" />
@@ -602,17 +602,17 @@
<xref linkend="svn.ref.svnsync.sw.sync_username" />
<xref linkend="svn.ref.svnsync.sw.trust_server_cert" />
</screen>
- </informalexample>
- </refsect1>
+ </informalexample>
+ </refsect1>
- <refsect1>
- <title>Examples</title>
+ <refsect1>
+ <title>Examples</title>
- <para>Copy unsynchronized revisions from the source
- repository to the mirror repository:</para>
+ <para>Copy unsynchronized revisions from the source
+ repository to the mirror repository:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnsync synchronize file:///var/svn/repos-mirror \
http://svn.example.com/repos
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/en/book/ref-svnversion.xml Thu Feb 7 12:43:50 2013
+++ /trunk/en/book/ref-svnversion.xml Tue Feb 12 12:02:17 2013
@@ -3,182 +3,182 @@
<reference id="svn.ref.svnversion">
<title>svnversion Reference—Subversion Working Copy Version
Info</title>
- <!-- ===============================================================
-->
- <refentry id="svn.ref.svnversion.re">
+ <!-- =============================================================== -->
+ <refentry id="svn.ref.svnversion.re">
- <indexterm>
- <primary>svnversion</primary>
- </indexterm>
+ <indexterm>
+ <primary>svnversion</primary>
+ </indexterm>
- <refnamediv>
- <refname>svnversion</refname>
- <refpurpose>Summarize the local revision(s) of a working
- copy.</refpurpose>
- </refnamediv>
+ <refnamediv>
+ <refname>svnversion</refname>
+ <refpurpose>Summarize the local revision(s) of a working
+ copy.</refpurpose>
+ </refnamediv>
- <refsect1 id="svn.ref.svnversion.re.syn">
- <title>Synopsis</title>
- <para><literal>svnversion [OPTIONS] [WC_PATH
[TRAIL_URL]]</literal></para>
- </refsect1>
+ <refsect1 id="svn.ref.svnversion.re.syn">
+ <title>Synopsis</title>
+ <para><literal>svnversion [OPTIONS] [WC_PATH
[TRAIL_URL]]</literal></para>
+ </refsect1>
- <refsect1 id="svn.ref.svnversion.re.desc">
- <title>Description</title>
+ <refsect1 id="svn.ref.svnversion.re.desc">
+ <title>Description</title>
- <para><command>svnversion</command> is a program for
- summarizing the revision mixture of a working copy. The
- resultant revision number, or revision range, is written to
- standard output.</para>
+ <para><command>svnversion</command> is a program for
+ summarizing the revision mixture of a working copy. The
+ resultant revision number, or revision range, is written to
+ standard output.</para>
- <para>It's common to use this output in your build process
- when defining the version number of your program.</para>
-
- <para><replaceable>TRAIL_URL</replaceable>, if present, is the
- trailing portion of the URL used to determine whether
- <replaceable>WC_PATH</replaceable> itself is switched
- (detection of switches within
- <replaceable>WC_PATH</replaceable> does not rely on
- <replaceable>TRAIL_URL</replaceable>).</para>
+ <para>It's common to use this output in your build process
+ when defining the version number of your program.</para>
+
+ <para><replaceable>TRAIL_URL</replaceable>, if present, is the
+ trailing portion of the URL used to determine whether
+ <replaceable>WC_PATH</replaceable> itself is switched
+ (detection of switches within
+ <replaceable>WC_PATH</replaceable> does not rely on
+ <replaceable>TRAIL_URL</replaceable>).</para>
- <para>When <replaceable>WC_PATH</replaceable> is not defined,
- the current directory will be used as the working copy path.
- <replaceable>TRAIL_URL</replaceable> cannot be defined if
- <replaceable>WC_PATH</replaceable> is not explicitly
- given.</para>
+ <para>When <replaceable>WC_PATH</replaceable> is not defined,
+ the current directory will be used as the working copy path.
+ <replaceable>TRAIL_URL</replaceable> cannot be defined if
+ <replaceable>WC_PATH</replaceable> is not explicitly
+ given.</para>
- </refsect1>
+ </refsect1>
- <refsect1 id="svn.ref.svnversion.re.sw">
- <title>Options</title>
+ <refsect1 id="svn.ref.svnversion.re.sw">
+ <title>Options</title>
- <para>Like <command>svnserve</command>,
- <command>svnversion</command> has no subcommands—only
- options:</para>
+ <para>Like <command>svnserve</command>,
+ <command>svnversion</command> has no subcommands—only
+ options:</para>
- <variablelist>
-
- <varlistentry id="svn.ref.svnversion.sw.no_newline">
- <term><option>--no-newline</option>
(<option>-n</option>)</term>
- <listitem>
- <para>Omits the usual trailing newline from the
output.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svnversion.sw.committed">
- <term><option>--committed</option> (<option>-c</option>)</term>
- <listitem>
- <para>Uses the last-changed revisions rather than the
- current (i.e., highest locally available) revisions.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svnversion.sw.help">
- <term><option>--help</option> (<option>-h</option>)</term>
- <listitem>
- <para>Prints a help summary.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svnversion.sw.quiet">
- <term><option>--quiet</option> (<option>-q</option>)</term>
- <listitem>
- <para>Requests that the program print only essential
- information while performing an operation.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svnversion.sw.version">
- <term><option>--version</option></term>
- <listitem>
- <para>Prints the version of <command>svnversion</command>
- and exit with no error.</para>
- </listitem>
- </varlistentry>
+ <variablelist>
+
+ <varlistentry id="svn.ref.svnversion.sw.no_newline">
+ <term><option>--no-newline</option> (<option>-n</option>)</term>
+ <listitem>
+ <para>Omits the usual trailing newline from the output.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svnversion.sw.committed">
+ <term><option>--committed</option> (<option>-c</option>)</term>
+ <listitem>
+ <para>Uses the last-changed revisions rather than the
+ current (i.e., highest locally available) revisions.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svnversion.sw.help">
+ <term><option>--help</option> (<option>-h</option>)</term>
+ <listitem>
+ <para>Prints a help summary.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svnversion.sw.quiet">
+ <term><option>--quiet</option> (<option>-q</option>)</term>
+ <listitem>
+ <para>Requests that the program print only essential
+ information while performing an operation.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svnversion.sw.version">
+ <term><option>--version</option></term>
+ <listitem>
+ <para>Prints the version of <command>svnversion</command>
+ and exit with no error.</para>
+ </listitem>
+ </varlistentry>
- </variablelist>
- </refsect1>
+ </variablelist>
+ </refsect1>
- <refsect1 id="svn.ref.svnversion.re.examples">
- <title>Examples</title>
+ <refsect1 id="svn.ref.svnversion.re.examples">
+ <title>Examples</title>
- <para>If the working copy is all at the same revision (e.g.,
- immediately after an update), then that revision is
- printed out:</para>
+ <para>If the working copy is all at the same revision (e.g.,
+ immediately after an update), then that revision is
+ printed out:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnversion
4168
</screen>
- </informalexample>
+ </informalexample>
- <para>You can add <replaceable>TRAIL_URL</replaceable> to make
- sure the working copy is not switched from what you
- expect. Note that the <replaceable>WC_PATH</replaceable>
- is required in this command:</para>
+ <para>You can add <replaceable>TRAIL_URL</replaceable> to make
+ sure the working copy is not switched from what you
+ expect. Note that the <replaceable>WC_PATH</replaceable>
+ is required in this command:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnversion . /var/svn/trunk
4168
</screen>
- </informalexample>
+ </informalexample>
- <para>For a mixed-revision working copy, the range of
- revisions present is printed:</para>
+ <para>For a mixed-revision working copy, the range of
+ revisions present is printed:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnversion
4123:4168
</screen>
- </informalexample>
+ </informalexample>
- <para>If the working copy contains modifications, a trailing
- '<literal>M</literal>' is added:</para>
+ <para>If the working copy contains modifications, a trailing
+ '<literal>M</literal>' is added:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnversion
4168M
</screen>
- </informalexample>
+ </informalexample>
- <para>If the working copy is switched, a trailing
- '<literal>S</literal>' is added:</para>
+ <para>If the working copy is switched, a trailing
+ '<literal>S</literal>' is added:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnversion
4168S
</screen>
- </informalexample>
+ </informalexample>
- <para><command>svnversion</command> will also inform you if
- the target working copy is sparsely populated (see
- <xref linkend="svn.advanced.sparsedirs" />) by attaching the
- '<literal>P</literal>' code to its output:</para>
+ <para><command>svnversion</command> will also inform you if
+ the target working copy is sparsely populated (see
+ <xref linkend="svn.advanced.sparsedirs" />) by attaching the
+ '<literal>P</literal>' code to its output:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnversion
4168P
</screen>
- </informalexample>
+ </informalexample>
- <para>Thus, here is a mixed-revision, sparsely populated and
- switched working copy containing some local
- modifications:</para>
+ <para>Thus, here is a mixed-revision, sparsely populated and
+ switched working copy containing some local
+ modifications:</para>
- <informalexample>
- <screen>
+ <informalexample>
+ <screen>
$ svnversion
4123:4168MSP
</screen>
- </informalexample>
+ </informalexample>
- </refsect1>
+ </refsect1>
- </refentry>
+ </refentry>
</reference>
<!--
More information about the svnbook-dev
mailing list