[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Subversion Book Documentation Corrections

From: Francois Beausoleil <fbeausoleil_at_ftml.net>
Date: 2003-03-04 18:44:33 CET

Hi,

Here are some more modifications to the book.

Have a nice day,
Francois Beausoleil (fbos@users.sourceforge.net)
Developper of Java Gui Builder - http://jgb.sourceforge.net/

Log message:
* appa.xml, ch08.xml:
Corrections to the Subversion book. Grammatical errors and updates
to the documentation to reflect updated option names.

--------------------------- BEGIN PATCH ---------------------------

Index: doc/book/book/appa.xml
===================================================================
--- doc/book/book/appa.xml (revision 5197)
+++ doc/book/book/appa.xml (working copy)
@@ -260,7 +260,7 @@
  M ./bar/baz.c
      </screen>

- <para>If you specify the <option>--update</option>
+ <para>If you specify the <option>--show-updates</option>
        (<option>-u</option>) switch, a longer output format is
        used:</para>

@@ -293,13 +293,13 @@
      see:</para>

      <screen>
-A Add
-D Delete
-R Replace (delete, then re-add)
-M local Modification
-U Updated
-G merGed
-C Conflict
+A Scheduled for addition
+D Scheduled for deletion
+M Has local modifications
+C Has conflicts
+? Item not under version control
+! Item is missing
+~ Conflict between kind (file as a folder or vice versa)
      </screen>

      <para>Subversion has combined the CVS <command>P</command> and
@@ -412,7 +412,7 @@
        Subversion examines the <literal>svn:mime-type</literal>
        property. If the file has no <literal>svn:mime-type</literal>
        property, or has a mime-type that is textual (e.g. text/*),
- Subversion assumes it is text. Otherwise, Subversion it assumes
+ Subversion assumes it is text. Otherwise, Subversion assumes
        the file is binary. Subversion also helps users by running a
        binary-detection algorithm in the <command>svn import</command>
        and <command>svn add</command> commands. These commands will
Index: doc/book/book/ch08.xml
===================================================================
--- doc/book/book/ch08.xml (revision 5197)
+++ doc/book/book/ch08.xml (working copy)
@@ -1,22 +1,22 @@
  <chapter id="svn-ch-8">
    <title>Subversion Complete Reference</title>
-
+
    <simplesect>
      <para>This chapter is intended to be a complete reference to using
        Subversion. This includes the command line client
- (<command>svn</command>) and all its commands, as well as the
+ (<command>svn</command>) and all its subcommands, as well as the
        repository administration programs (<command>svnadmin</command>
- and <command>svnlook</command>) and their respective commands.
+ and <command>svnlook</command>) and their respective subcommands.
      </para>
    </simplesect>
-
+
    <!-- ================================================================= -->
    <!-- ======================== SECTION 1 ============================== -->
    <!-- ================================================================= -->
    <sect1 id="svn-ch-8-sect-1">
      <title>The Subversion Command Line Client:
        <command>svn</command></title>
-
+
      <para>To use the command line client, you type
        <command>svn</command>, the subcommand you wish to use
        <footnote><para>Yes, yes, you don't need a subcommand to use the
@@ -29,17 +29,17 @@

      <screen>
  $ svn -v status
-$ svn status -v
+$ svn status -v
  $ svn status -v myfile
      </screen>

      <para>You can find many more examples of how to use most client
- commands in <xref linkend="svn-ch-3"/>, commands for managing
+ commands in <xref linkend="svn-ch-3"/> and commands for managing
        properties in <xref linkend="svn-ch-6-sect-2"/></para>
-
+
      <sect2 id="svn-ch-8-sect-1.1">
- <title>Switches</title>
-
+ <title>Switches</title>
+
        <para>While Subversion has different switches for its
          subcommands, all switches are global&mdash;that is, each
          switch is guaranteed to mean the same thing regardless of
@@ -49,7 +49,7 @@
          subcommand you use it with.</para>

        <variablelist>
-
+
          <varlistentry>
            <term><option>--dry-run</option></term>
            <listitem>
@@ -58,11 +58,11 @@
                the repository. </para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--file</option> (<option>-F</option>)
              <replaceable>FILENAME</replaceable>
- </term>
+ </term>
            <listitem>
              <para>Uses the contents of the file passed as an argument
                to this switch for the specified subcommand.</para>
@@ -81,7 +81,7 @@
          </varlistentry>

          <varlistentry>
- <term><option>--extensions</option><replaceable>"ARGS"</replaceable></term>
+ <term><option>--extensions</option> <replaceable>"ARGS"</replaceable></term>
            <listitem>
              <para>Specifies an argument or arguments that Subversion
                should pass to GNU diff when providing differences
@@ -95,7 +95,7 @@
                </para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--force</option></term>
            <listitem>
@@ -110,16 +110,18 @@
                you're doing, you're likely to get a nasty shock.</para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
- <term><option>--help</option> (<option>-h or -?</option>)</term>
+ <term><option>--help</option> (<option>-h</option> or
+ <option>-?</option>)
+ </term>
            <listitem>
              <para>If used with one or more subcommands, shows the
                built-in help text for each subcommand. If used alone,
                it displays the general client help text.</para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--incremental</option></term>
            <listitem>
@@ -127,21 +129,21 @@
                concatenation.</para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--message</option> (<option>-m</option>)
              <replaceable>MESSAGE</replaceable>
- </term>
+ </term>
            <listitem>
              <para>Indicates that you will specify a commit message
                on the command line, following this switch. For
                example:</para>
-
+
              <para><command>$ svn commit -m "Initial
                  import."</command></para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--no-auth-cache</option></term>
            <listitem>
@@ -150,7 +152,7 @@
                administrative directories.</para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--no-diff-deleted</option></term>
          <listitem>
@@ -161,7 +163,7 @@
                the file but removed all the content.</para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--no-ignore</option></term>
            <listitem>
@@ -184,7 +186,7 @@
              for more information.</para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--non-recursive</option> (<option>-N</option>)</term>
            <listitem>
@@ -197,7 +199,7 @@
          </varlistentry>

          <varlistentry>
- <term><option>--password</option><replaceable>PASS</replaceable></term>
+ <term><option>--password</option> <replaceable>PASS</replaceable></term>
            <listitem>
              <para>Indicates that you are providing your password for
                authentication on the command line&mdash;otherwise, if
@@ -205,7 +207,7 @@
                it.</para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--quiet</option> (<option>-q</option>)</term>
            <listitem>
@@ -213,7 +215,7 @@
                information while performing an operation.</para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--recursive</option> (<option>-R</option>)</term>
            <listitem>
@@ -221,11 +223,11 @@
                Most subcommands recurse by default.</para>
            </listitem>
          </varlistentry>
-
+
          <varlistentry>
            <term><option>--revision</option> (<option>-r</option>)
              <replaceable>REV</replaceable>
- </term>
+ </term>
            <listitem>
              <para>Indicates that you're going to supply a revision (or
                range of revisions) for a particular operation. You can
@@ -247,7 +249,7 @@
                information.</para>
              </listitem>
            </varlistentry>
-
+
            <varlistentry>
              <term><option>--revprop</option></term>
              <listitem>
@@ -260,7 +262,7 @@
                  unversioned properties.</para>
              </listitem>
            </varlistentry>
-
+
            <varlistentry>
              <term><option>--show-updates</option> (<option>-u</option>)</term>
              <listitem>
@@ -272,7 +274,7 @@
                </para>
              </listitem>
            </varlistentry>
-
+
            <varlistentry>
              <term><option>--strict</option></term>
              <listitem>
@@ -284,7 +286,7 @@
                specified.</para>
              </listitem>
            </varlistentry>
-
+
            <varlistentry>
              <term><option>--targets</option>
                <replaceable>FILENAME</replaceable></term>
@@ -295,7 +297,7 @@
                </para>
              </listitem>
            </varlistentry>
-
+
            <varlistentry>
              <term><option>--username</option><replaceable>NAME</replaceable></term>
              <listitem>
@@ -305,7 +307,7 @@
                  it.</para>
              </listitem>
            </varlistentry>
-
+
            <varlistentry>
              <term><option>--verbose</option></term>
              <listitem>
@@ -316,7 +318,7 @@
                  additional information regarding its actions.</para>
              </listitem>
            </varlistentry>
-
+
            <varlistentry>
              <term><option>--version</option></term>
              <listitem>
@@ -327,18 +329,18 @@
                  repository.</para>
              </listitem>
            </varlistentry>
-
+
            <varlistentry>
              <term><option>--xml</option></term>
              <listitem>
                <para>Prints output in xml format.</para>
              </listitem>
            </varlistentry>
-
+
          </variablelist>
-
+
        </sect2>
-
+
        <sect2 id="svn-ch-8-sect-1.2">
          <title><command>svn subcommands</command></title>

@@ -348,12 +350,12 @@
              <refpurpose>Adds files and directories</refpurpose>
            </refnamediv>
            <refsect1>
- <title>Synopsis</title>
+ <title>Synopsis</title>
              <programlisting>svn add PATH [PATH [PATH ... ]]</programlisting>
            </refsect1>
            <refsect1>
              <title>Description</title>
-
+
              <para>Adds files and directories to your working copy and
                schedules them for addition to the repository. They
                will be uploaded and added to the repository on your
@@ -361,17 +363,17 @@
                before committing, you can unschedule the addition using
                <command>svn revert</command>.</para>
            </refsect1>
-
+
            <refsect1>
              <title>Alternate names</title>
              <para>None</para>
            </refsect1>
-
+
            <refsect1>
              <title>Changes</title>
              <para>Working Copy</para>
            </refsect1>
-
+
            <refsect1>
              <title>Switches</title>

@@ -381,20 +383,20 @@
    --quiet (-q)
              </screen>
            </refsect1>
-
+
            <refsect1>
              <title>Examples</title>
-
+
              <para>To add a file to your working copy:</para>

              <screen>
- $ svn add foo.c
+ $ svn add foo.c
    A foo.c
              </screen>

              <para>When adding a directory, the default behavior of
                svn add is to recurse:</para>
-
+
              <screen>
    $ svn add testdir
    A testdir
@@ -406,7 +408,7 @@

              <para>You can add a directory without adding its
                contents:</para>
-
+
              <screen>
    $ svn add --non-recursive otherdir
    A otherdir
@@ -426,7 +428,7 @@
            </refsect1>
            <refsect1>
              <title>Description</title>
-
+
              <para>Outputs the contents of the specified files or URLs.
                For listing the contents of directories, see svn list.</para>
            </refsect1>
@@ -477,13 +479,13 @@

              <screen>
  $ cat foo.c
-This file is in my local working copy
+This file is in my local working copy
  and has changes that I've made.

  $ svn cat foo.c
  Latest revision fresh from the repository!
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -499,7 +501,7 @@
            </refsect1>
            <refsect1>
              <title>Description</title>
-
+
              <para>Checks out a working copy from a repository. If
                <replaceable>PATH</replaceable> is omitted, the
                basename of the URL will be used as the
@@ -526,7 +528,7 @@

            <refsect1>
              <title>Switches</title>
-
+
              <screen>
  --revision (-r) REV
  --quiet (-q)
@@ -537,7 +539,7 @@
  --non-interactive
              </screen>
            </refsect1>
-
+
            <refsect1>
              <title>Examples</title>

@@ -666,7 +668,7 @@
                <literal>editor-cmd</literal> section in <xref
                linkend="svn-ch-6-sect-1.3.2"/>.</para>
            </refsect1>
-
+
            <refsect1>
              <title>Alternate names</title>
              <para>ci</para>
@@ -706,7 +708,7 @@
              <para>Commit a simple modification to a file with the
                commit message on the command line and an implicit
                target of your current directory (<quote>.</quote>):</para>
-
+
              <screen>
  $ svn commit -m "added howto section."
  Sending a
@@ -751,7 +753,7 @@

  Committed revision 7.
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -770,11 +772,11 @@

            <refsect1>
              <title>Description</title>
-
+
              <para>Copy a file in a working copy or in the repository.
                SRC and DST can each be either a working copy
                (WC) path or URL:</para>
-
+
                <variablelist>

                  <varlistentry>
@@ -966,7 +968,7 @@
  --encoding ENC
              </screen>
            </refsect1>
-
+
            <refsect1>
              <title>Examples</title>

@@ -998,17 +1000,17 @@
                that has local mods:</para>

              <screen>
-$ svn delete over-there
+$ svn delete over-there
  subversion/clients/cmdline/delete-cmd.c:47: (apr_err=195006)
  svn: Attempting restricted operation for modified resource
  svn: Use --force to override this restriction
  subversion/libsvn_client/delete.c:90: (apr_err=195006)
  svn: 'over-there' has local modifications

-$ svn delete --force over-there
+$ svn delete --force over-there
  D over-there
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -1106,7 +1108,7 @@
                popular uses of svn diff):</para>

              <screen>
-$ svn diff COMMITTERS
+$ svn diff COMMITTERS
  Index: COMMITTERS
  ===================================================================
  --- COMMITTERS (revision 4404)
@@ -1117,7 +1119,7 @@
                against an older revision:</para>

              <screen>
-$ svn diff -r 3900 COMMITTERS
+$ svn diff -r 3900 COMMITTERS
  Index: COMMITTERS
  ===================================================================
  --- COMMITTERS (revision 3900)
@@ -1152,7 +1154,7 @@
                differences without typing in the long URLs:</para>

              <screen>
-$ svn diff -r 3000:3500 COMMITTERS
+$ svn diff -r 3000:3500 COMMITTERS
  Index: COMMITTERS
  ===================================================================
  --- COMMITTERS (revision 3000)
@@ -1161,16 +1163,16 @@

              <para>Use <option>-x</option> to pass arguments directly
                to the external diff program</para>
-
+
              <screen>
-svn diff -x "-i -b" COMMITTERS
+svn diff -x "-i -b" COMMITTERS
  Index: COMMITTERS
  ===================================================================
  0a1,2
  &gt; This is a test
-&gt;
+&gt;
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -1195,7 +1197,7 @@
                local directory name.</para>

              <para>The second form exports a clean directory tree from
- the working copy specified by PATH1 into PATH2. all
+ the working copy specified by PATH1 into PATH2. All
                local changes will be preserved, but files not under
                revision control will not be copied.</para>
            </refsect1>
@@ -1269,7 +1271,7 @@
              <para>This is your best friend when you're using
                Subversion and this book isn't within reach!</para>
            </refsect1>
-
+
            <refsect1>
              <title>Alternate names</title>
              <para>?, h</para>
@@ -1369,13 +1371,14 @@
                recursively create directories for you:</para>

              <screen>
-$ svn import -m "New import" http://svn.red-bean.com/repos/test myproj trunk/vendors/myproj
+$ svn import -m "New import" http://svn.red-bean.com/repos/test \
+ myproj trunk/vendors/myproj
  Adding myproj/sample.txt
  ...
  Transmitting file data .........
  Committed revision 19.
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -1439,7 +1442,7 @@

              <para><command>svn info</command> will show you all the
                useful information that it has for items in your working
- copy. It will show informtion for files:</para>
+ copy. It will show information for files:</para>

              <screen>
  $ svn info foo.c
@@ -1470,7 +1473,7 @@
  Last Changed Rev: 19
  Last Changed Date: 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003)
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -1488,7 +1491,7 @@
              <title>Description</title>

              <para>List directory entries of a URL. If URL is a file,
- just file entry will be displayed. <command>svn
+ just the file entry will be displayed. <command>svn
                list</command> does not work on paths in your working
                copy.</para>
            </refsect1>
@@ -1583,10 +1586,10 @@
                add paths past the URL, only messages for those paths
                under that URL will be printed.</para>

- <para>With <option>--verbose</option>, also print all
- affected paths with each log message. With
- <option>--quiet</option>, <command>svn log</command>
- don't print the log message body itself (this is
+ <para>With <option>--verbose</option>, <command>svn log</command>
+ will also print all affected paths with each log message.
+ With <option>--quiet</option>, <command>svn log</command>
+ will not print the log message body itself (this is
                compatible with <option>--verbose</option>).</para>

              <para>Each log message is printed just once, even if more
@@ -1783,9 +1786,9 @@
                  that revision. If you log from the top of the
                  repository, or know the file that changed in that
                  revision, you can specify it explicitly:</para>
-
+
                <screen>
-$ svn log -r 20 touched.txt
+$ svn log -r 20 touched.txt
  ------------------------------------------------------------------------
  rev 20: sally | 2003-01-17 22:56:19 -0600 (Fri, 17 Jan 2003) | 1 line

@@ -1862,7 +1865,8 @@
                you have a working copy of the trunk):</para>

              <screen>
-$ svn merge http://svn.red-bean.com/repos/trunk/vendors http://svn.red-bean.com/repos/branches/vendors-with-fix
+$ svn merge http://svn.red-bean.com/repos/trunk/vendors \
+ http://svn.red-bean.com/repos/branches/vendors-with-fix
  U myproj/tiny.txt
  U myproj/thhgttg.txt
  U myproj/win.txt
@@ -1878,7 +1882,7 @@
  U myproj/thhgttg.txt
  ...
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -1898,7 +1902,7 @@
              <para>Create a directory with a name given by the final
                component of TARGET. If TARGET is a working copy path
                the directory is scheduled for addition in the working
- copy. If TARGET is an URL the directory is created in
+ copy. If TARGET is a URL the directory is created in
                the repository via an immediate commit. In both cases
                all the intermediate directories must already
                exist.</para>
@@ -1944,7 +1948,7 @@
  A newdir
              </screen>

- <para>Create on in the repository (instant commit, so a
+ <para>Create one in the repository (instant commit, so a
                log message is required):</para>

              <screen>
@@ -1952,7 +1956,7 @@

  Committed revision 26.
                </screen>
-
+
            </refsect1>
          </refentry>

@@ -2050,7 +2054,8 @@
                so it requires a commit message): </para>

              <screen>
-$ svn move -m "Move a file" http://svn.red-bean.com/repos/foo.c http://svn.red-bean.com/repos/bar.c
+$ svn move -m "Move a file" http://svn.red-bean.com/repos/foo.c \
+ http://svn.red-bean.com/repos/bar.c

  Committed revision 27.
              </screen>
@@ -2075,7 +2080,7 @@

              <para>Set PROPNAME to PROPVAL on files, directories, or
              revisions. The first example creates a versioned, local
- propchange in working copy, and the second creates an
+ propchange in the working copy, and the second creates an
              unversioned, remote propchange on a repository revision.</para>

              <tip>
@@ -2121,7 +2126,7 @@
              <para>Set the mimetype on a file:</para>

              <screen>
-$ svn propset svn:mime-type image/jpeg foo.jpg
+$ svn propset svn:mime-type image/jpeg foo.jpg
  property `svn:mime-type' set on 'foo.jpg'
              </screen>

@@ -2153,7 +2158,7 @@

              <para>Or, if you don't have a working copy, you can
              provide a URL.</para>
-
+
              <screen>
  $ svn propset --revprop -r 26 svn:log "Document nap." http://svn.red-bean.com/repos
  property `svn:log' set on repository revision '25'
@@ -2164,7 +2169,7 @@
              property to something binary:</para>

              <screen>
-$ svn propset owner-pic -F sally.jpg moo.c
+$ svn propset owner-pic -F sally.jpg moo.c
  property `owner-pic' set on 'moo.c'
              </screen>

@@ -2241,7 +2246,7 @@
              <para>Delete a revision property:</para>

              <screen>
-$ svn propdel --revprop -r 26 release-date
+$ svn propdel --revprop -r 26 release-date
  property `release-date' deleted from repository revision '26'
              </screen>

@@ -2300,7 +2305,7 @@
                modify properties that have multiple values:</para>

              <screen>
-$ svn propedit svn:keywords foo.c
+$ svn propedit svn:keywords foo.c
      &lt;svn will launch your favorite editor here, with a buffer open
      containing the current contents of the svn:keywords property. You
      can add multiple values to a property easily here by entering one
@@ -2364,7 +2369,7 @@

              <para>Examine a property of a file in your working
                copy:</para>
-
+
              <screen>
  $ svn propget svn:keywords foo.c
  Author
@@ -2375,10 +2380,10 @@
              <para>The same goes for a revision property:</para>

              <screen>
-$ svn propget svn:log --revprop -r 20
+$ svn propget svn:log --revprop -r 20
  Began journal.
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -2427,7 +2432,7 @@
  --revprop
              </screen>
            </refsect1>
-
+
            <refsect1>
              <title>Examples</title>

@@ -2453,7 +2458,7 @@
    svn:keywords : Author Date Rev
    owner : sally
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -2600,10 +2605,10 @@
  --quiet (-q)
              </screen>
            </refsect1>
-
+
            <refsect1>
              <title>Examples</title>
-
+
              <para>If you get a conflict on an update, your working
                copy will sprout three new files:</para>

@@ -2660,12 +2665,12 @@
                character wide, and each column gives you information
                about different aspects of each working copy
                item.</para>
-
+
              <para>The first column indicates that an item
                was added, deleted, or otherwise changed.</para>

              <variablelist>
-
+
                <varlistentry>
                  <term>' '</term>
                  <listitem>
@@ -2683,7 +2688,7 @@
                <varlistentry>
                  <term>'D'</term>
                  <listitem>
- <para>Item is scheduled for Addition.</para>
+ <para>Item is scheduled for Deletion.</para>
                  </listitem>
                </varlistentry>

@@ -2731,7 +2736,7 @@
                directory's properties.</para>

              <variablelist>
-
+
                <varlistentry>
                  <term>' '</term>
                  <listitem>
@@ -2762,14 +2767,14 @@
                working copy directory is locked.</para>

              <variablelist>
-
+
                <varlistentry>
                  <term>' '</term>
                  <listitem>
                    <para>Item is not locked.</para>
                  </listitem>
                </varlistentry>
-
+
                <varlistentry>
                  <term>'L'</term>
                  <listitem>
@@ -2781,16 +2786,16 @@

              <para>The fourth column is populated only if the item is
                scheduled for addition-with-history.</para>
-
+
              <variablelist>
-
+
                <varlistentry>
                  <term>' '</term>
                  <listitem>
                    <para>No history scheduled with commit.</para>
                  </listitem>
                </varlistentry>
-
+
                <varlistentry>
                  <term>'+'</term>
                  <listitem>
@@ -2805,14 +2810,14 @@
                linkend="svn-ch-4-sect-5"/>).</para>

              <variablelist>
-
+
                <varlistentry>
                  <term>' '</term>
                  <listitem>
                    <para>Item is child of its parent directory.</para>
                  </listitem>
                </varlistentry>
-
+
                <varlistentry>
                  <term>'S'</term>
                  <listitem>
@@ -2827,14 +2832,14 @@
                <option>--show-updates</option> switch).</para>

              <variablelist>
-
+
                <varlistentry>
                  <term>' '</term>
                  <listitem>
                    <para>The item in your working copy is up-to-date.</para>
                  </listitem>
                </varlistentry>
-
+
                <varlistentry>
                  <term>'*'</term>
                  <listitem>
@@ -2849,11 +2854,11 @@
                delimited by spaces. The working revision is the next
                field if the <option>--show-updates</option> or
                <option>--verbose</option>switches are passed.</para>
-
+
              <para>If the <option>--verbose</option> switch is passed,
                the last committed revision and last committed author
                are displayed next.</para>
-
+
              <para>The working copy path is always the final field, so
                it can include spaces.</para>

@@ -2954,8 +2959,8 @@
                a new URL&mdash;usually a URL which shares a common
                ancestor with your working copy, although not
                necessarily. This is the Subversion way to move a
- working copy to a new branch. (See <xref
- linkend="svn-ch-4-sect-5"/>) for an in-depth look at
+ working copy to a new branch. See <xref
+ linkend="svn-ch-4-sect-5"/> for an in-depth look at
                switching.</para>
            </refsect1>

@@ -2987,7 +2992,7 @@
  --non-interactive
              </screen>
            </refsect1>
-
+
            <refsect1>
              <title>Examples</title>

@@ -3158,19 +3163,19 @@
                  single file, you may want to use <command>svn
                  cat</command>.</para>
              </tip>
-
+
            </refsect1>
          </refentry>
        </sect2>
-
+
      </sect1>
-
+
      <!-- ================================================================= -->
      <!-- ======================== SECTION 2 ============================== -->
      <!-- ================================================================= -->
      <sect1 id="svn-ch-8-sect-2">
        <title><command>svnadmin</command></title>
-
+
        <para><command>svnadmin</command> is the administrative tool for
          monitoring and repairing your Subversion repository. For
          detailed information, see <xref
@@ -3182,25 +3187,25 @@
          administration tools) operates on <emphasis>paths</emphasis>
          not <emphasis>URLs</emphasis>.</para>
        </warning>
-
+
        <sect2 id="svn-ch-8-sect-2.1">
- <title>Switches</title>
-
+ <title>Switches</title>
+
          <variablelist>
-
+
            <varlistentry>
              <term><option>--copies</option></term>
              <listitem>
                <para>Follow copy history when examining a path.</para>
              </listitem>
            </varlistentry>
-
+
            <varlistentry>
              <term><option>--in-repos-template ARG</option></term>
              <listitem>
                <para>Specify a template for the repository structure when
                  creating a new repository.</para>
-
+
                <para>The <quote>in-repository</quote> templates specify
                  the layout of the repository itself (which lives in
                  Berkeley DB files inside the db/ directory) like
@@ -3226,7 +3231,7 @@
              <term><option>--on-disk-template <replaceable>ARG</replaceable></option></term>
              <listitem>

- <para>Specify a templete to use for the on-disk
+ <para>Specify a template to use for the on-disk
                  structure (i.e. <filename>conf/</filename>,
                  <filename>hooks/</filename>, etc.) of the repository
                  you want to create.</para>
@@ -3310,7 +3315,7 @@
            <screen>
  $ svnadmin create /usr/local/svn/repos
            </screen>
-
+
          </refsect1>
        </refentry>

@@ -3336,13 +3341,13 @@
              </refsect1>
          <refsect1>
            <title>Switches</title>
-
+
            <screen>
  --revision (-r)
  --incremental
            </screen>
          </refsect1>
-
+
          <refsect1>
            <title>Examples</title>

@@ -3362,7 +3367,7 @@
              repository: </para>

            <screen>
-$ svnadmin dump /usr/local/svn/repos -r 21 --incremental
+$ svnadmin dump /usr/local/svn/repos -r 21 --incremental
  * Dumped revision 21.
  SVN-fs-dump-format-version: 1
  Revision-number: 21
@@ -3522,7 +3527,7 @@
              repository.</para>

            <screen>
-$ svnadmin lstxns /usr/local/svn/repos/
+$ svnadmin lstxns /usr/local/svn/repos/
  1w
  1x
            </screen>
@@ -3557,11 +3562,11 @@

          <refsect1>
            <title>Examples</title>
-
+
            <para>Recover a hung repository:</para>

            <screen>
-$ svnadmin recover /usr/local/svn/repos/
+$ svnadmin recover /usr/local/svn/repos/
  Acquiring exclusive lock on repository db.
  Recovery is running, please stand by...
  Recovery completed.
@@ -3667,13 +3672,13 @@
        </refentry>

      </sect1>
-
+
      <!-- ================================================================= -->
      <!-- ======================== SECTION 3 ============================== -->
      <!-- ================================================================= -->
      <sect1 id="svn-ch-8-sect-3">
        <title><command>svnlook</command></title>
-
+
        <para><command>svnlook</command> is a command line utility for
          examining different aspects of a Subversion repository. It
          does not make any changes to the repository&mdash;it's just
@@ -3688,10 +3693,10 @@

        <para>If no revision or transaction is specified, svnlook defaults
          to the youngest (most recent) revision of the repository.</para>
-
+
        <sect2 id="svn-ch-8-sect-3.1">
          <title>Switches</title>
-
+
          <para>Switches in <command>svnlook</command> are global, just
            like in <command>svn</command> and
            <command>svnadmin</command>, however, most switches only
@@ -3759,7 +3764,7 @@

            <refsect1>
              <title>Switches</title>
-
+
              <screen>
  --revision (-r)
  --transaction (-t)
@@ -3773,9 +3778,9 @@
                very exciting:</para>

              <screen>
-$ svnlook author -r 40 /usr/local/svn/repos
+$ svnlook author -r 40 /usr/local/svn/repos
  sally
- </screen>
+ </screen>

            </refsect1>
          </refentry>
@@ -3824,7 +3829,7 @@
  A trunk/vendors/deli/sandwich.txt
  A trunk/vendors/deli/pickle.txt
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -3853,14 +3858,14 @@
  --transaction (-t)
              </screen>
            </refsect1>
-
+
            <refsect1>
              <title>Examples</title>
-
+
              <para>This shows the date of revision 40 of a test
                repository:</para>

- <screen>
+ <screen>
  $ svnlook date -r 40 /tmp/repos/
  2003-02-22 17:44:49 -0600 (Sat, 22 Feb 2003)
              </screen>
@@ -3887,7 +3892,7 @@

            <refsect1>
              <title>Switches</title>
-
+
              <screen>
  --revision (-r)
  --transaction (-t)
@@ -3897,7 +3902,7 @@

            <refsect1>
              <title>Examples</title>
-
+
              <para>This shows a newly added (empty) file, a deleted
              file, and a copied file:</para>

@@ -3921,7 +3926,7 @@
  Deleted: trunk/vendors/deli/pickle.txt
  ==============================================================================
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -3962,7 +3967,7 @@
  $ svnlook dirs-changed -r 40 /usr/local/svn/repos
  trunk/vendors/deli/
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -4024,7 +4029,7 @@
  15
  Rearrange lunch.
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -4046,16 +4051,16 @@

            <refsect1>
              <title>Switches</title>
-
+
              <screen>
  --revision (-r)
  --transaction (-t)
              </screen>
            </refsect1>
-
+
            <refsect1>
              <title>Examples</title>
-
+
              <para>This shows the log output for revision 40 in our sample
              repository:</para>

@@ -4063,7 +4068,7 @@
  $ svnlook log /tmp/repos/
  Rearrange lunch.
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -4096,7 +4101,7 @@

            <refsect1>
              <title>Examples</title>
-
+
              <para>This shows the tree output (with node-IDs) for revision
                40 in our sample repository:</para>

@@ -4110,7 +4115,7 @@
      soda.txt &lt;1k.0.2j&gt;
      sandwich.txt &lt;1j.0.2j&gt;
              </screen>
-
+
            </refsect1>
          </refentry>

@@ -4135,9 +4140,9 @@

            <para>This shows the youngest revision of our sample
                repository:</para>
-
- <screen>
-$ svnlook youngest /tmp/repos/
+
+ <screen>
+$ svnlook youngest /tmp/repos/
  42
              </screen>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 4 18:46:07 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.