Hello community,
here is the log from the commit of package subversion-doc for openSUSE:Factory
checked in at 2015-09-17 09:19:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subversion-doc (Old)
and /work/SRC/openSUSE:Factory/.subversion-doc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion-doc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/subversion-doc/subversion-doc.changes
2013-12-11 11:33:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.subversion-doc.new/subversion-doc.changes
2015-09-17 09:19:45.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Sep 13 13:09:33 UTC 2015 - astie...@suse.com
+
+- update to /trunk r5043
+
+-------------------------------------------------------------------
Old:
----
subversion-doc-1.8.r4562.tar.bz2
New:
----
subversion-doc-1.8.r5043.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subversion-doc.spec ++++++
--- /var/tmp/diff_new_pack.1o8F59/_old 2015-09-17 09:19:46.000000000 +0200
+++ /var/tmp/diff_new_pack.1o8F59/_new 2015-09-17 09:19:46.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package subversion-doc
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,26 +16,26 @@
#
+#
+%define apache_sysconfdir %{_sysconfdir}/apache2
Name: subversion-doc
-BuildRequires: docbook-xsl-stylesheets
-BuildRequires: libxslt
-%if 0%{?suse_version} > 1210
-BuildRequires: libxml2-tools
-%endif
-Version: 1.8.r4562
+Version: 1.8.r5043
Release: 0
-BuildArch: noarch
-#
-%define apache_sysconfdir /etc/apache2
#
Summary: Documentation files for Subversion
License: CC-BY-2.0
Group: Development/Tools/Version Control
-# from http://svnbook.red-bean.com/en/1.7/svn.copyright.html
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://svnbook.red-bean.com/
Source0: %{name}-%{version}.tar.bz2
Source1: subversion.doc.conf
+BuildRequires: docbook-xsl-stylesheets
+BuildRequires: libxslt
+# from http://svnbook.red-bean.com/en/1.7/svn.copyright.html
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+%if 0%{?suse_version} > 1210
+BuildRequires: libxml2-tools
+%endif
%description
This package contains the subversion book (see
@@ -44,20 +44,20 @@
%prep
%setup -q
-ln -sv /usr/share/xml/docbook/stylesheet/nwalsh/current/ tools/xsl
+ln -sv %{_datadir}/xml/docbook/stylesheet/nwalsh/current/ tools/xsl
%build
cd en
SVNVERSION=`echo "%{version}" | sed -r "s/[0-9]+\.[0-9]+\.(r[0-9]+)/\1/"`
sed -i "s/&svn\.version;/${SVNVERSION}/g" book/book.xml
-%__make html SVNVERSION=/bin/false
+make %{?_smp_mflags} html SVNVERSION=/bin/false
%install
cd en
-%__make install-html SVNVERSION=/bin/false
INSTALL_DIR=$RPM_BUILD_ROOT%{_defaultdocdir}/subversion/html
-install -m 644 -D %{S:1}
$RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.doc.conf
-find $RPM_BUILD_ROOT -type d -print0 | xargs -0 chmod 755
-find $RPM_BUILD_ROOT -type f -print0 | xargs -0 chmod 644
+make install-html SVNVERSION=/bin/false
INSTALL_DIR=%{buildroot}%{_defaultdocdir}/subversion/html
+install -m 644 -D %{SOURCE1}
%{buildroot}/%{apache_sysconfdir}/conf.d/subversion.doc.conf
+find %{buildroot} -type d -print0 | xargs -0 chmod 755
+find %{buildroot} -type f -print0 | xargs -0 chmod 644
%files
%defattr(-,root,root)
++++++ subversion-doc-1.8.r4562.tar.bz2 -> subversion-doc-1.8.r5043.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/subversion-doc-1.8.r4562/en/book/book.xml
new/subversion-doc-1.8.r5043/en/book/book.xml
--- old/subversion-doc-1.8.r4562/en/book/book.xml 2013-02-07
21:43:50.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/book.xml 2015-01-16
17:02:27.000000000 +0100
@@ -17,7 +17,6 @@
<!ENTITY ch06 SYSTEM "ch06-server-configuration.xml">
<!ENTITY ch07 SYSTEM "ch07-customizing-svn.xml">
<!ENTITY ch08 SYSTEM "ch08-embedding-svn.xml">
-<!ENTITY ch09 SYSTEM "ch09-reference.xml">
<!-- Part II: References -->
<!ENTITY refsvn SYSTEM "ref-svn.xml">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/subversion-doc-1.8.r4562/en/book/ch02-basic-usage.xml
new/subversion-doc-1.8.r5043/en/book/ch02-basic-usage.xml
--- old/subversion-doc-1.8.r4562/en/book/ch02-basic-usage.xml 2013-02-08
19:32:43.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/ch02-basic-usage.xml 2014-10-27
15:55:52.000000000 +0100
@@ -1666,11 +1666,11 @@
<varlistentry>
<term><filename>filename.mine</filename></term>
<listitem>
- <para>This is your file as it existed in your
- working copy before you began the update process.
- This version of the file contains your local
- modifications as well as conflict markers. (If
- Subversion considers the file to be unmergeable,
+ <para>This is the file as it existed in your working
+ copy before you began the update process. It
+ contains any local modifications you had made to
+ the file up to that point. (If Subversion
+ considers the file to be unmergeable,
the <filename>.mine</filename> file isn't created,
since it would be identical to the working
file.)</para>
@@ -1754,7 +1754,7 @@
changes. You'll do this with the <command>svn
resolve</command> command. This command accepts
the <option>--accept</option> option, which allows you
- specify your desired approach for resolving the conlict.
+ specify your desired approach for resolving the conflict.
Prior to Subversion 1.8, the <command>svn resolve</command>
<emphasis>required</emphasis> the use of this option.
Subversion now allows you to run the <command>svn
@@ -1769,7 +1769,7 @@
<para>The <option>--accept</option> option to the <command>svn
resolve</command> command instructs Subversion to use one of
- a its pre-packaged approaches to conflict resolution. If
+ its pre-packaged approaches to conflict resolution. If
you want Subversion to resolve the conflict using the
version of the file that you last checked out before making
your edits, use <option>--accept=base</option>. If you'd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/subversion-doc-1.8.r4562/en/book/ch03-advanced-topics.xml
new/subversion-doc-1.8.r5043/en/book/ch03-advanced-topics.xml
--- old/subversion-doc-1.8.r4562/en/book/ch03-advanced-topics.xml
2013-05-28 23:23:29.000000000 +0200
+++ new/subversion-doc-1.8.r5043/en/book/ch03-advanced-topics.xml
2015-01-08 20:59:33.000000000 +0100
@@ -563,7 +563,7 @@
But Subversion needs to know whether we are asking about how the
<emphasis>current</emphasis> file looked back in revision 1, or
whether we are asking for the contents of whatever file lived at
- <filename>concepts/IDEA</filename> in revision 1. Certainly
+ <filename>concept/IDEA</filename> in revision 1. Certainly
those questions have different answers, and because of peg
revisions, you can ask those questions. To find out how the
current <filename>IDEA</filename> file looked in that old
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/subversion-doc-1.8.r4562/en/book/ch04-branching-and-merging.xml
new/subversion-doc-1.8.r5043/en/book/ch04-branching-and-merging.xml
--- old/subversion-doc-1.8.r4562/en/book/ch04-branching-and-merging.xml
2013-03-11 22:51:40.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/ch04-branching-and-merging.xml
2015-02-23 21:14:18.000000000 +0100
@@ -4596,10 +4596,10 @@
<informalexample>
<screen>
$ svn commit -m "Upgrade vendor branch to libcomplex 1.0.1." \
- libcomplex-custom
-Sending libcomplex-custom/README
-Sending libcomplex-custom/src/code.h
-Sending libcomplex-custom/src/code.c
+ libcomplex-1.0.1
+Sending libcomplex-1.0.1/README
+Sending libcomplex-1.0.1/src/code.h
+Sending libcomplex-1.0.1/src/code.c
Transmitting file data ...
Committed revision 1283.
$
@@ -4628,7 +4628,7 @@
$ cd libcomplex-custom
$ svn merge ^/vendor/libcomplex-1.0.0 \
^/vendor/libcomplex-1.0.1
---- Merging differences between URLs into '.':
+--- Merging differences between repository URLs into '.':
U src/code.h
C src/code.c
U README
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/subversion-doc-1.8.r4562/en/book/ch05-repository-admin.xml
new/subversion-doc-1.8.r5043/en/book/ch05-repository-admin.xml
--- old/subversion-doc-1.8.r4562/en/book/ch05-repository-admin.xml
2013-04-19 16:46:44.000000000 +0200
+++ new/subversion-doc-1.8.r5043/en/book/ch05-repository-admin.xml
2015-04-14 18:05:00.000000000 +0200
@@ -3773,6 +3773,21 @@
reasons, we recommend against relying solely on dump-based
backup approaches.</para>
+ <para>Beginning with Subversion 1.8, <command>svnadmin hotcopy</command>
+ accepts <option>--incremental</option> option and supports incremental
+ hotcopy mode for FSFS repositories. In incremental hotcopy mode,
+ revision data which has already been copied from the source to the
+ destination repository will not be copied again. When
+ <option>--incremental</option> option is used with
+ <command>svnadmin hotcopy</command>, Subversion will only copy new
+ revisions, and revisions which have changed in size or had their
+ modification time stamp changed since the previous hotcopy
+ operation. Moreover, unlike with <command>svnsync</command> or
+ <command>svnadmin dump --incremental</command>, performance of
+ <command>svnadmin hotcopy --incremental</command> is only limited to
+ disk I/O. Therefore, incremental hotcopy can be a huge
+ time saver when making a backup of a large repository.</para>
+
<para>As you can see, each of the various backup types and
methods has its advantages and disadvantages. The easiest is
by far the full hot backup, which will always result in a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/subversion-doc-1.8.r4562/en/book/ch06-server-configuration.xml
new/subversion-doc-1.8.r5043/en/book/ch06-server-configuration.xml
--- old/subversion-doc-1.8.r4562/en/book/ch06-server-configuration.xml
2013-04-18 16:34:18.000000000 +0200
+++ new/subversion-doc-1.8.r5043/en/book/ch06-server-configuration.xml
2015-04-15 14:41:21.000000000 +0200
@@ -2969,9 +2969,44 @@
and <quote>operative revision</quote> concepts. They can
be a bit tricky to wrap your head around.</para>
- <para>As a reminder, this feature
- of <command>mod_dav_svn</command> offers only a limited
- repository browsing experience. You can see directory
+ <para>Beginning with Subversion 1.8, <command>mod_dav_svn</command>
+ has the ability to substitute keywords. When
+ <command>mod_dav_svn</command>
+ finds the query argument <literal>kw=1</literal> added to
+ the URL of a file, it will expand keywords when delivering
+ the file's content. Omitting the <literal>kw</literal>
+ parameter or using any value besides <literal>1</literal>
+ for that parameter will cause Subversion to use its
+ default behavior, which is to deliver the file's content
+ without any keywords expanded.</para>
+
+ <para>Because keyword substitution is typically performed by the
+ Subversion client as part of its working copy administration
+ and management, this is a handy way to get the server to deliver
+ a keyword-expanded form of your versioned file without the use
+ of a working copy.</para>
+
+ <para>For example, if you wish to see the latest version of a
+ <filename>README.txt</filename> file located in your
+ project's <filename>/trunk</filename> with keywords
+ expanded, add the query argument <literal>kw=1</literal> to the
+ URL:</para>
+
+ <informalexample>
+ <programlisting>
+http://host.example.com/repos/project/trunk/README.txt?kw=1
+</programlisting>
+ </informalexample>
+
+ <para>As with client-side keyword expansion, only those keywords
+ which are explicitly designated for expansion via the
+ <literal>svn:keywords</literal> property set on the file itself
+ will be expanded. See
+ <xref linkend="svn.advanced.props.special.keywords" /> for a
+ detailed description of the keyword substitution feature.</para>
+
+ <para>As a reminder, <command>mod_dav_svn</command> offers only a
+ limited repository browsing experience. You can see directory
listings and file contents, but no revision properties
(such as commit log messages) or file/directory
properties. For folks who require more extensive browsing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/subversion-doc-1.8.r4562/en/book/ch07-customizing-svn.xml
new/subversion-doc-1.8.r5043/en/book/ch07-customizing-svn.xml
--- old/subversion-doc-1.8.r4562/en/book/ch07-customizing-svn.xml
2013-02-08 19:32:43.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/ch07-customizing-svn.xml
2015-08-06 22:19:12.000000000 +0200
@@ -429,7 +429,7 @@
client connections. For more details, see <xref
linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
- <para>The <literal>miscellany</literal> section is where
+ <para>The <literal>[miscellany]</literal> section is where
everything that doesn't belong elsewhere winds
up.<footnote><para>Anyone for potluck
dinner?</para></footnote> In this section, you can
@@ -668,6 +668,42 @@
<literal>yes</literal> in the <literal>miscellany</literal>
section if you want to enable auto-props.</para>
+ <para>New to Subversion 1.8, the <literal>[working-copy]</literal>
+ section is used for configuring working copies. Valid options in
+ this section are:</para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>exclusive-locking-clients</literal></term>
+ <listitem>
+ <para>Enables exclusive SQLite locking of working copies for the
+ client, hence improving performance for working copies located
+ on network disks. By setting this config variable to
+ <literal>svn</literal>, you instruct Subversion command-line
+ client to use exclusive locking. This reduces the locking
+ overhead but does mean that only one Subversion client will be
+ able to access the working copy at a time. A second client
+ attempting to access a locked working copy will block for 10
+ seconds and then get an error. In most cases shared locking is
+ preferred but if the working copy is on a network disk rather
+ than a local disk the locking overhead is more significant.
+ When dealing with large working copies on network disks
+ exclusive locking may give a significant performance gain,
+ two or three times faster in some cases. This option is new to
+ Subversion 1.8.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>exclusive-locking</literal></term>
+ <listitem>
+ <para>Setting this config variable to <literal>true</literal>
+ enables exclusive SQLite locking of working copies for
+ all Subversion 1.8 clients. Enabling this may cause some
+ clients to fail to work properly. The default value for this
+ option is <literal>false</literal>. This option is new to
+ Subversion 1.8.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</sect3>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -1560,7 +1596,7 @@
# Call the merge command (change the following line to make sense for
# your merge program).
-cmd = [DIFF3, '--base', BASE, '--mine', MINE, '--theirs', THEIRS,
+cmd = [MERGE, '--base', BASE, '--mine', MINE, '--theirs', THEIRS,
'--outfile', MERGED]
os.execv(cmd[0], cmd)
@@ -1575,7 +1611,7 @@
@ECHO OFF
REM Configure your favorite merge program here.
-SET DIFF3="C:\Program Files\Funky Stuff\My Merge Tool.exe"
+SET MERGE="C:\Program Files\Funky Stuff\My Merge Tool.exe"
REM Get the paths provided by Subversion.
SET BASE=%1
@@ -1586,7 +1622,7 @@
REM Call the merge command (change the following line to make sense for
REM your merge program).
-%DIFF3% --base %BASE% --mine %MINE% --theirs %THEIRS% --outfile %MERGED%
+%MERGE% --base %BASE% --mine %MINE% --theirs %THEIRS% --outfile %MERGED%
REM Return an errorcode of 0 if the conflict was resolved; 1 otherwise.
REM Any other errorcode will be treated as fatal.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/subversion-doc-1.8.r4562/en/book/ref-reposhooks.xml
new/subversion-doc-1.8.r5043/en/book/ref-reposhooks.xml
--- old/subversion-doc-1.8.r4562/en/book/ref-reposhooks.xml 2013-02-13
22:11:19.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/ref-reposhooks.xml 2015-04-16
15:24:23.000000000 +0200
@@ -228,7 +228,8 @@
<refsynopsisdiv>
<para><literal>post-commit
<replaceable>REPOS-PATH</replaceable>
- <replaceable>REVISION</replaceable></literal></para>
+ <replaceable>REVISION</replaceable>
+ <replaceable>TXN-NAME</replaceable></literal></para>
</refsynopsisdiv>
<!-- =============================================================== -->
@@ -265,6 +266,10 @@
<listitem>
<para>Revision number created by the commit</para>
</listitem>
+ <listitem>
+ <para>Name of the transaction that has become the revision triggering
+ the post-commit hook.</para>
+ </listitem>
</orderedlist>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/subversion-doc-1.8.r4562/en/book/ref-svn.xml
new/subversion-doc-1.8.r5043/en/book/ref-svn.xml
--- old/subversion-doc-1.8.r4562/en/book/ref-svn.xml 2013-02-13
22:11:19.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/ref-svn.xml 2015-08-06
22:01:45.000000000 +0200
@@ -514,6 +514,14 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.ignore_properties">
+ <term><option>--ignore-properties</option></term>
+ <listitem>
+ <para>Instructs <command>svn diff</command> to suppress
+ output of property changes.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.ignore_whitespace">
<term><option>--ignore-whitespace</option></term>
<listitem>
@@ -623,6 +631,16 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.no_diff_added">
+ <term><option>--no-diff-added</option></term>
+ <listitem>
+ <para>Prevents Subversion from printing differences for
+ added files. The default behavior when you add a file is to print
+ the same differences that you would see if you had added the entire
+ contents of an existing (empty) file.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.no_diff_deleted">
<term><option>--no-diff-deleted</option></term>
<listitem>
@@ -739,6 +757,25 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.patch_compatible">
+ <term><option>--patch-compatible</option></term>
+ <listitem>
+ <para>Instructs <command>svn diff</command> to produce output
+ compatible with generic third-party patch tools. The result of
+ using this option is the same as running <command>svn
diff</command>
+ with <option>--show-copies-as-adds --ignore-properties</option>
+ options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.properties_only">
+ <term><option>--properties-only</option></term>
+ <listitem>
+ <para>Instructs <command>svn diff</command> to show only property
+ changes.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.quiet">
<term><option>--quiet</option> (<option>-q</option>)</term>
<listitem>
@@ -847,11 +884,72 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.search">
+ <term><option>--search</option> <replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Filters log messages to show only those that match
+ the search pattern <replaceable>ARG</replaceable>. Log
+ messages are displayed only if the provided search
+ pattern matches any of the author, date, log message
+ text (unless <option>--quiet</option> is used), or, if
+ the <option>--verbose</option> option is also provided,
+ a changed path. If multiple <option>--search</option>
+ options are provided, a log message is shown if it
+ matches any of the provided search patterns. If
+ <option>--limit</option> is used, it restricts the
+ number of log messages searched, rather than
+ restricting the output to a particular number of
+ matching log messages.</para>
+
+ <para>The search pattern may include "glob syntax"
+ wildcards:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>
+ <literal>?</literal>
+ </term>
+ <listitem>
+ <para>Matches any single character.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <literal>*</literal>
+ </term>
+ <listitem>
+ <para>Matches a sequence of arbitrary characters.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <literal>[ABC]</literal>
+ </term>
+ <listitem>
+ <para>Matches any of the characters listed inside the
+ brackets.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.search_and">
+ <term><option>--search-and</option>
<replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>The option's argument is combined with the pattern from
+ the previous <option>--search</option>
+ or <option>--search-and</option> option on the command
+ line. Log message is shown only if it matches the
+ combined search pattern.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.set_depth">
<term><option>--set-depth</option>
<replaceable>ARG</replaceable></term>
<listitem>
- <para>Sets the sticky depth on a directory in a working
- copy to one of <literal>exclude</literal>,
<literal>empty</literal>,
+ <para>Sets the sticky depth on a directory in a working copy
+ to one of <literal>exclude</literal>, <literal>empty</literal>,
<literal>files</literal>, <literal>immediates</literal>,
or <literal>infinity</literal>. For detailed coverage
of what these mean and how to use this option, see
@@ -2518,11 +2616,15 @@
<xref linkend="svn.ref.svn.sw.extensions" />
<xref linkend="svn.ref.svn.sw.force" />
<xref linkend="svn.ref.svn.sw.git" />
+<xref linkend="svn.ref.svn.sw.ignore_properties" />
<xref linkend="svn.ref.svn.sw.internal_diff" />
<xref linkend="svn.ref.svn.sw.new" />
+<xref linkend="svn.ref.svn.sw.no_diff_added" />
<xref linkend="svn.ref.svn.sw.no_diff_deleted" />
<xref linkend="svn.ref.svn.sw.notice_ancestry" />
<xref linkend="svn.ref.svn.sw.old" />
+<xref linkend="svn.ref.svn.sw.patch_compatible" />
+<xref linkend="svn.ref.svn.sw.properties_only" />
<xref linkend="svn.ref.svn.sw.revision" />
<xref linkend="svn.ref.svn.sw.show_copies_as_adds" />
<xref linkend="svn.ref.svn.sw.summarize" />
@@ -3429,6 +3531,8 @@
<xref linkend="svn.ref.svn.sw.limit" />
<xref linkend="svn.ref.svn.sw.quiet" />
<xref linkend="svn.ref.svn.sw.revision" />
+<xref linkend="svn.ref.svn.sw.search" />
+<xref linkend="svn.ref.svn.sw.search_and" />
<xref linkend="svn.ref.svn.sw.stop_on_copy" />
<xref linkend="svn.ref.svn.sw.targets" />
<xref linkend="svn.ref.svn.sw.use_merge_history" />
@@ -3728,6 +3832,106 @@
and <option>--extensions</option>
(<option>-x</option>).</para>
+ <para>
+ Beginning with Subversion 1.8, users can filter <command>svn
log</command>
+ output using <option>--search</option> and
<option>--search-and</option>
+ options. When using these options, a log message is shown only if a
+ revision's author, date, log message text, or list of changed paths,
+ matches a search pattern. Searching by changed patch requies
+ <option>--verbose</option> option, otherwise <command>svn log</command>
+ does not show changed paths therefore they can't be filtered.
+ </para>
+ <para>
+ The search pattern may include "glob syntax"
+ wildcards:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <literal>?</literal>
+ </term>
+ <listitem>
+ <para>
+ Matches any single character.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <literal>*</literal>
+ </term>
+ <listitem>
+ <para>
+ Matches a sequence of arbitrary
+ characters.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <literal>[ABC]</literal>
+ </term>
+ <listitem>
+ <para>
+ Matches any of the characters listed inside the brackets.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+ Using multiple <option>--search</option> parameters will show log
messages
+ that match the pattern specified at least in one of the options. For
example:
+ </para>
+ <informalexample>
+<screen>
+$ svn log --search sally --search harry https://svn.red-bean.com/repos/test
+------------------------------------------------------------------------
+r1701 | sally | 2011-10-12 22:35:30 -0600 (Wed, 12 Oct 2011) | 1 line
+
+Add a reminder.
+------------------------------------------------------------------------
+r1564 | harry | 2011-10-09 22:35:30 -0600 (Sun, 09 Oct 2011) | 1 line
+
+Merge r1560 to the 1.0.x branch.
+------------------------------------------------------------------------
+$
+ </screen>
+ </informalexample>
+ <para>
+ Using <option>--search</option> with <option>--search-and</option>
options will show log messages
+ that match the combined pattern from both options. For example:
+ </para>
+ <informalexample>
+<screen>
+$ svn log --verbose --search sally --search-and /foo/bar
https://svn.red-bean.com/repos/test
+------------------------------------------------------------------------
+r1555 | sally | 2011-07-15 22:33:14 -0600 (Fri, 15 Jul 2011) | 1 line
+Changed paths:
+M /foo/bar/src.c
+
+Typofix.
+------------------------------------------------------------------------
+r1530 | sally | 2011-07-13 07:24:11 -0600 (Wed, 13 Jul 2011) | 1 line
+Changed paths:
+M /foo/bar
+M /foo/build
+
+Fix up some svn:ignore properties.
+------------------------------------------------------------------------
+$
+</screen>
+ </informalexample>
+ <tip>
+ <para>
+ <option>--search</option> and <option>--search-and</option>
+ options does not actually perform a search. They just filter
+ the <command>svn log</command> output to display only log
+ messages that match the specified pattern. Therefore, if
+ <option>--limit</option> is used, it restricts the number
+ of log messages searched, rather than restricting the
+ output to a particular number of matching log messages.
+ </para>
+ </tip>
</refsect1>
</refentry>
@@ -5313,7 +5517,7 @@
<informalexample>
<screen>
-$ svn relocate http://svn.company.com/repos/trunk
+$ svn relocate https://svn.company.com/repos/trunk
$
</screen>
</informalexample>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/subversion-doc-1.8.r4562/en/book/ref-svnadmin.xml
new/subversion-doc-1.8.r5043/en/book/ref-svnadmin.xml
--- old/subversion-doc-1.8.r4562/en/book/ref-svnadmin.xml 2013-02-13
22:11:19.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/ref-svnadmin.xml 2015-04-14
20:16:38.000000000 +0200
@@ -64,6 +64,14 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svnadmin.sw.compatible_version">
+ <term><option>--compatible-version</option>
<replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Use repository format compatible with Subversion version
+ <replaceable>ARG</replaceable>.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svnadmin.sw.config_dir">
<!-- Only 'svnadmin create' accepts it, and the underlying
logic doesn't even use it. Weird. -->
@@ -85,6 +93,14 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svnadmin.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.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svnadmin.sw.fs_type">
<term><option>--fs-type</option> <replaceable>ARG</replaceable></term>
<listitem>
@@ -148,27 +164,30 @@
<varlistentry id="svn.ref.svnadmin.sw.pre_1.4_compatible">
<term><option>--pre-1.4-compatible</option></term>
<listitem>
- <para>When creating a new repository, use a format that is
- compatible with versions of Subversion earlier than
- Subversion 1.4.</para>
+ <para><emphasis>Deprecated</emphasis>. See option
+ <option>--compatible-version</option>. When creating a new
+ repository, use a format that is compatible with versions of
+ Subversion earlier than Subversion 1.4.</para>
</listitem>
</varlistentry>
<varlistentry id="svn.ref.svnadmin.sw.pre_1.5_compatible">
<term><option>--pre-1.5-compatible</option></term>
<listitem>
- <para>When creating a new repository, use a format that is
- compatible with versions of Subversion earlier than
- Subversion 1.5.</para>
+ <para><emphasis>Deprecated</emphasis>. See option
+ <option>--compatible-version</option>. When creating a new
+ repository, use a format that is compatible with versions of
+ Subversion earlier than Subversion 1.5.</para>
</listitem>
</varlistentry>
<varlistentry id="svn.ref.svnadmin.sw.pre_1.6_compatible">
<term><option>--pre-1.6-compatible</option></term>
<listitem>
- <para>When creating a new repository, use a format that is
- compatible with versions of Subversion earlier than
- Subversion 1.6.</para>
+ <para><emphasis>Deprecated</emphasis>. See option
+ <option>--compatible-version</option>. When creating a new
+ repository, use a format that is compatible with versions of
+ Subversion earlier than Subversion 1.6.</para>
</listitem>
</varlistentry>
@@ -355,6 +374,7 @@
<screen>
<xref linkend="svn.ref.svnadmin.sw.bdb_log_keep" />
<xref linkend="svn.ref.svnadmin.sw.bdb_txn_nosync" />
+<xref linkend="svn.ref.svnadmin.sw.compatible_version" />
<xref linkend="svn.ref.svnadmin.sw.config_dir" />
<xref linkend="svn.ref.svnadmin.sw.fs_type" />
<xref linkend="svn.ref.svnadmin.sw.pre_1.4_compatible" />
@@ -511,11 +531,20 @@
some cases, drastically) the size of the dump file that
<command>svnadmin dump</command> creates. There are, however,
disadvantages to using this option—deltified
- dump files are more CPU-intensive to create, cannot be
- operated on by <command>svndumpfilter</command>, and tend
+ dump files are more CPU-intensive to create and tend
not to compress as well as their nondeltified counterparts
when using third-party tools such as <command>gzip</command>
and <command>bzip2</command>.</para>
+
+ <tip>
+ <para>Beginning with Subversion 1.8,
+ <command>svndumpfilter</command> can operate on deltified
+ dump streams. Prior to this release,
+ <command>svndumpfilter</command> would not work with dump
+ streams created using <option>--deltas</option>
+ option.</para>
+ </tip>
+
</refsect1>
<!-- =============================================================== -->
@@ -565,6 +594,74 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
+ <refentry id="svn.ref.svnadmin.c.freeze">
+
+ <indexterm>
+ <primary>svnadmin</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>freeze</tertiary>
+ </indexterm>
+
+ <refnamediv>
+ <refname>svnadmin freeze</refname>
+ <refpurpose>Prevent commits to the repository while running an arbitary
program.</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><literal>svnadmin freeze REPOS_PATH PROGRAM
[ARG...]</literal></para>
+ <para><literal>svnadmin freeze --file FILENAME PROGRAM
[ARG...]</literal></para>
+ </refsynopsisdiv>
+
+ <!-- =============================================================== -->
+ <refsect1>
+ <title>Description</title>
+
+ <para>This subcommand prevents concurrent commits to the repository
+ <replaceable>REPOS_PATH</replaceable> (i.e. it freezes the
+ repository) while running <replaceable>PROGRAM</replaceable> with
+ <replaceable>ARG</replaceable> arguments. Clients trying to
+ commit concurrently will wait until the repository becomes
+ available again. The subcommand is intended for backup purposes so
+ that third-party backup tools such as <command>rsync</command> can
+ be safely used on a live repository.</para>
+
+ <para>If <option>--file</option> option is used, then all repositories
+ listed in <replaceable>FILENAME</replaceable> will froze. The
+ file format is a list of <replaceable>REPOS_PATH</replaceable>
+ separated by newlines. Repositories freeze in the
+ same order as they are listed in the file.</para>
+ </refsect1>
+
+ <!-- =============================================================== -->
+ <refsect1>
+ <title>Options</title>
+
+ <informalexample>
+ <screen>
+<xref linkend="svn.ref.svnadmin.sw.file" />
+</screen>
+ </informalexample>
+ </refsect1>
+ <!-- =============================================================== -->
+ <refsect1>
+ <title>Examples</title>
+
+ <para>Freeze the repository and run <command>rsync</command> to
+ make its backup:</para>
+
+ <informalexample>
+ <screen>
+$ svnadmin freeze /var/svn/repos -- rsync -av /var/svn/repos /backup/repos
+</screen>
+ </informalexample>
+
+ </refsect1>
+ </refentry>
+
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+
<refentry id="svn.ref.svnadmin.c.help">
<indexterm>
@@ -617,16 +714,29 @@
<refsect1>
<title>Description</title>
- <para>This subcommand makes a full <quote>hot</quote> backup
+ <para>This subcommand makes a <quote>hot</quote> backup
of your repository, including all hooks, configuration
- files, and, of course, database files. If you pass the
- <option>--clean-logs</option> option,
- <command>svnadmin</command> will perform a hot copy of your
- repository, and then remove unused Berkeley DB logs from
- the original repository. You can run this command at any
+ files, and, of course, database files. You can run this command at any
time and make a safe copy of the repository, regardless of
whether other processes are using the repository.</para>
+ <para>Prior to Subversion 1.8, <command>svnadmin hotcopy</command> always
+ made a full hot copy of the source repository. Beginning with
+ Subversion 1.8 it supports incremental copy to the existing
+ destination copy of the same source repository. By passing the
+ <option>--incremental</option> option to
+ <command>svnadmin hotcopy</command>, you can instruct Subversion to
+ copy only new revisions and revisions which have changed in size or had
+ timestamp modifications. The UUID of the hotcopy destination
+ repository must match the UUID of the hotcopy source repository.
+ Incremental hotcopy mode is supported for FSFS repositories
+ only.</para>
+
+ <para>If you pass the <option>--clean-logs</option> option,
+ <command>svnadmin</command> will perform a hot copy of your
+ repository, and then remove unused Berkeley DB logs from
+ the original repository.</para>
+
</refsect1>
<!-- =============================================================== -->
@@ -636,6 +746,7 @@
<informalexample>
<screen>
<xref linkend="svn.ref.svnadmin.sw.clean_logs" />
+<xref linkend="svn.ref.svnadmin.sw.incremental" />
</screen>
</informalexample>
@@ -765,7 +876,7 @@
</refnamediv>
<refsynopsisdiv>
- <para><literal>svnadmin load REPOS_PATH</literal></para>
+ <para><literal>svnadmin load REPOS_PATH [-r
LOWER[:UPPER]]</literal></para>
</refsynopsisdiv>
<!-- =============================================================== -->
@@ -773,8 +884,24 @@
<title>Description</title>
<para>Read a repository dump stream from
- <filename>stdin</filename>, committing new revisions into the
repository's
- filesystem. Send progress feedback to
<filename>stdout</filename>.</para>
+ <filename>stdin</filename>, committing new revisions
+ into the repository's filesystem. Progress
+ feedback is sent to <filename>stdout</filename>. If
+ no revisions are given, read and commit all revisions. But
+ if <option>--revision</option> is provided, read and commit
+ revisions <replaceable>LOWER</replaceable> rev through
+ <replaceable>UPPER</replaceable> rev only. If only
+ <replaceable>LOWER</replaceable> is given, load that one
+ revision.</para>
+
+ <para>Prior to Subversion 1.8, <command>svnadmin load</command>
+ was limited to reading all revisions that the dump stream
+ contains, but now <command>svnadmin load</command> accepts
+ <option>--revision</option> option that acts as a filter for
+ dump stream revisions. This allows you to incrementally load
+ only a range of revisions from a single dump stream making
+ some repository maintenance and reorganization tasks much
+ easier.</para>
</refsect1>
<!-- =============================================================== -->
@@ -789,6 +916,7 @@
<xref linkend="svn.ref.svnadmin.sw.memory_cache_size" />
<xref linkend="svn.ref.svnadmin.sw.parent_dir" />
<xref linkend="svn.ref.svnadmin.sw.quiet" />
+<xref linkend="svn.ref.svnadmin.sw.revision" />
<xref linkend="svn.ref.svnadmin.sw.use_post_commit_hook" />
<xref linkend="svn.ref.svnadmin.sw.use_pre_commit_hook" />
</screen>
@@ -850,6 +978,52 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
+ <refentry id="svn.ref.svnadmin.c.lock">
+
+ <indexterm>
+ <primary>svnadmin</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>lock</tertiary>
+ </indexterm>
+
+ <refnamediv>
+ <refname>svnadmin lock</refname>
+ <refpurpose>Lock path in the repository directly.</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><literal>svnadmin lock REPOS_PATH PATH-IN-REPOS USERNAME FILE
+ [TOKEN]</literal>
+ </para>
+ </refsynopsisdiv>
+
+ <!-- =============================================================== -->
+ <refsect1>
+ <title>Description</title>
+
+ <para>Lock <replaceable>PATH-IN-REPOS</replaceable> in the
+ repository, assigning ownership of the lock
+ to <replaceable>USERNAME</replaceable> and using the contents
+ of <replaceable>FILE</replaceable> as comments associated with
+ the created lock. If provided,
+ use <replaceable>TOKEN</replaceable> as lock token.</para>
+
+ </refsect1>
+
+ <!-- =============================================================== -->
+ <refsect1>
+ <title>Options</title>
+ <informalexample>
+ <screen>
+<xref linkend="svn.ref.svnadmin.sw.bypass_hooks" />
+</screen>
+ </informalexample>
+ </refsect1>
+ </refentry>
+
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
<refentry id="svn.ref.svnadmin.c.lslocks">
<indexterm>
@@ -1414,6 +1588,48 @@
</refsect1>
</refentry>
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <!-- ================================================================= -->
+ <refentry id="svn.ref.svnadmin.c.unlock">
+
+ <indexterm>
+ <primary>svnadmin</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>unlock</tertiary>
+ </indexterm>
+
+ <refnamediv>
+ <refname>svnadmin unlock</refname>
+ <refpurpose>Unlock path in the repository directly.</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><literal>svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME
+ TOKEN</literal></para>
+ </refsynopsisdiv>
+
+ <!-- =============================================================== -->
+ <refsect1>
+ <title>Description</title>
+
+ <para>Unlock <replaceable>LOCKED_PATH</replaceable> in the
+ repository (as <replaceable>USERNAME</replaceable>) after
+ verifying that the token associated with the lock
+ matches <replaceable>TOKEN</replaceable>.</para>
+
+ </refsect1>
+
+ <!-- =============================================================== -->
+ <refsect1>
+ <title>Options</title>
+ <informalexample>
+ <screen>
+<xref linkend="svn.ref.svnadmin.sw.bypass_hooks" />
+</screen>
+ </informalexample>
+ </refsect1>
+ </refentry>
<!-- ================================================================= -->
<!-- ================================================================= -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/subversion-doc-1.8.r4562/en/book/ref-svndumpfilter.xml
new/subversion-doc-1.8.r5043/en/book/ref-svndumpfilter.xml
--- old/subversion-doc-1.8.r4562/en/book/ref-svndumpfilter.xml 2013-02-13
22:11:19.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/ref-svndumpfilter.xml 2015-04-16
16:50:58.000000000 +0200
@@ -21,9 +21,18 @@
<varlistentry id="svn.ref.svndumpfilter.sw.drop_empty_revs">
<term><option>--drop-empty-revs</option></term>
<listitem>
- <para>If filtering causes any revision to be empty (i.e.,
- causes no change to the repository), removes these
- revisions from the final dump file.</para>
+ <para>If the current filtering invocation causes any revision to be
+ empty (i.e., the revision causes no change to the repository),
+ removes these revisions from the final dump file.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svndumpfilter.sw.drop_all_empty_revs">
+ <term><option>--drop-all-empty-revs</option></term>
+ <listitem>
+ <para>Removes all empty revisions found in the dumpstream from the
+ final dump file (except revision 0).</para>
</listitem>
</varlistentry>
@@ -130,6 +139,7 @@
<informalexample>
<screen>
<xref linkend="svn.ref.svndumpfilter.sw.drop_empty_revs" />
+<xref linkend="svn.ref.svndumpfilter.sw.drop_all_empty_revs" />
<xref linkend="svn.ref.svndumpfilter.sw.pattern" />
<xref linkend="svn.ref.svndumpfilter.sw.preserve_revprops" />
<xref linkend="svn.ref.svndumpfilter.sw.quiet" />
@@ -236,6 +246,7 @@
<informalexample>
<screen>
<xref linkend="svn.ref.svndumpfilter.sw.drop_empty_revs" />
+<xref linkend="svn.ref.svndumpfilter.sw.drop_all_empty_revs" />
<xref linkend="svn.ref.svndumpfilter.sw.pattern" />
<xref linkend="svn.ref.svndumpfilter.sw.preserve_revprops" />
<xref linkend="svn.ref.svndumpfilter.sw.quiet" />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/subversion-doc-1.8.r4562/en/book/ref-svnlook.xml
new/subversion-doc-1.8.r5043/en/book/ref-svnlook.xml
--- old/subversion-doc-1.8.r4562/en/book/ref-svnlook.xml 2013-02-13
22:11:19.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/ref-svnlook.xml 2015-04-16
14:49:54.000000000 +0200
@@ -37,6 +37,20 @@
detailed copy source information.</para>
</listitem>
</varlistentry>
+
+ <varlistentry id="svn.ref.svnlook.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>svnlook 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.svnlook.sw.diff_copy_from">
<term><option>--diff-copy-from</option></term>
@@ -105,6 +119,14 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svnlook.sw.ignore_properties">
+ <term><option>--ignore-properties</option></term>
+ <listitem>
+ <para>Instructs <command>svnlook diff</command> to show only property
+ changes.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svnlook.sw.limit">
<term><option>--limit</option> (<option>-l</option>)
<replaceable>ARG</replaceable></term>
<listitem>
@@ -142,6 +164,14 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svnlook.sw.properties_only">
+ <term><option>--properties-only</option></term>
+ <listitem>
+ <para>Instructs <command>svnlook diff</command> to suppress
+ output of property changes.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svnlook.sw.revision">
<term><option>--revision</option> (<option>-r</option>)</term>
<listitem>
@@ -563,9 +593,12 @@
<informalexample>
<screen>
+<xref linkend="svn.ref.svnlook.sw.diff_cmd" />
<xref linkend="svn.ref.svnlook.sw.diff_copy_from" />
+<xref linkend="svn.ref.svnlook.sw.ignore_properties" />
<xref linkend="svn.ref.svnlook.sw.no_diff_added" />
<xref linkend="svn.ref.svnlook.sw.no_diff_deleted" />
+<xref linkend="svn.ref.svnlook.sw.properties_only" />
<xref linkend="svn.ref.svnlook.sw.revision" />
<xref linkend="svn.ref.svnlook.sw.transaction" />
<xref linkend="svn.ref.svnlook.sw.extensions" />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/subversion-doc-1.8.r4562/en/book/ref-svnserve.xml
new/subversion-doc-1.8.r5043/en/book/ref-svnserve.xml
--- old/subversion-doc-1.8.r4562/en/book/ref-svnserve.xml 2013-02-13
22:11:19.000000000 +0100
+++ new/subversion-doc-1.8.r5043/en/book/ref-svnserve.xml 2014-03-07
01:18:56.000000000 +0100
@@ -39,9 +39,9 @@
<command>sshd</command> launch it on demand for the
<literal>svn+ssh://</literal> access method.</para>
- <para>Regardless of the access method, once the client has
- selected a repository by transmitting its URL,
- <command>svnserve</command> reads a file named
+ <para>Unless the <option>--config-file</option> option was specified on
+ the command line, once the client has selected a repository by
+ transmitting its URL, <command>svnserve</command> reads a file named
<filename>conf/svnserve.conf</filename> in the repository
directory to determine repository-specific settings such as
what authentication database to use and what authorization
@@ -90,6 +90,21 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svnserve.sw.config_file">
+ <term><option>--config-file</option>
<replaceable>FILENAME</replaceable></term>
+ <listitem>
+ <para>When specified, <command>svnserve</command> reads
+ <replaceable>FILENAME</replaceable> once at program startup and
+ caches the <command>svnserve</command> configuration. The
+ password and authorization configurations referenced from
filename
+ will be loaded on each connection. <command>svnserve</command>
+ will not read any per‐repository
+ <filename>conf/svnserve.conf</filename> files when this option is
+ used. See the <xref linkend="svn.serverconfig.svnserve"/> for
+ details of the file format for this option.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svnserve.sw.daemon">
<term><option>--daemon</option> (<option>-d</option>)</term>
<listitem>
