[svnbook commit] r2413 - trunk/src/it/book
bpietro
noreply at red-bean.com
Mon Sep 11 07:32:02 CDT 2006
Author: bpietro
Date: Mon Sep 11 07:32:02 2006
New Revision: 2413
Modified:
trunk/src/it/book/ch09.xml
Log:
begin translation
Modified: trunk/src/it/book/ch09.xml
==============================================================================
--- trunk/src/it/book/ch09.xml (original)
+++ trunk/src/it/book/ch09.xml Mon Sep 11 07:32:02 2006
@@ -1,23 +1,31 @@
<chapter id="svn.ref">
- <title>Subversion Complete Reference</title>
-
+<!-- <title>Subversion Complete Reference</title> -->
+ <title>Riferimento completo di Subversion</title>
+
<simplesect>
- <para>This chapter is intended to be a complete reference to using
+ <para lang="en">This chapter is intended to be a complete reference to using
Subversion. This includes the command line client
(<command>svn</command>) and all its subcommands, as well as the
repository administration programs (<command>svnadmin</command>
and <command>svnlook</command>) and their respective
subcommands.</para>
+ <para>Questo capitolo ha intensione di essere un riferimento completo
+ per usare Subversion. Include il cliente a riga di comando
+ (<command>svn</command>) e i suoi sottocomandi, così come i programmi
+ per amministrazione del deposito (<command>svnadmin</command>
+ e <command>svnlook</command>) e loro rispettivi sottocomandi.</para>
</simplesect>
-
+
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.ref.svn">
- <title>The Subversion Command Line Client:
+<!-- <title>The Subversion Command Line Client:
+ <command>svn</command></title> -->
+ <title>Cliente a riga di comando di Subversion:
<command>svn</command></title>
-
- <para>To use the command line client, you type
+
+ <para lang="en">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
<option>--version</option> switch, but we'll get to that in just
@@ -27,21 +35,36 @@
the following are valid ways to use <command>svn
status</command>:</para>
+ <para>Per usare cliente a riga di comando, scrivere
+ <command>svn</command>, il sottocomando che volete usare
+ <footnote>
+ <para>Sì, sì, non avete bisogno di sottocomando per usare la opzione
+ <option>--version</option>, solo un minuto, ci arriviamo.
+ </para>
+ </footnote>, e qualsiasi opzione o parametro su quale volete
+ lavorare—non c'è ordine specifico in quale sottocomandi e opzioni
+ devono apparire. Per esempio, tutto che segue sono modi validi
+ per usare <command>svn status</command>:</para>
+
<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
+ <para lang="en">You can find many more examples of how to use most client
commands in <xref linkend="svn.tour"/> and commands for managing
properties in <xref linkend="svn.advanced.props"/>.</para>
-
+
+ <para>Altri esempi di come usare molti comandi del cliente potete trovare
+ nel <xref linkend="svn.tour"/> e comandi per maneggare le proprietà nella <xref linkend="svn.advanced.props"/>.</para>
+
<!-- =============================================================== -->
<sect2 id="svn.ref.svn.sw">
- <title><command>svn</command> Switches</title>
-
- <para>While Subversion has different switches for its
+<!-- <title><command>svn</command> Switches</title> -->
+ <title>Opzioni di <command>svn</command></title>
+
+ <para lang="en">While Subversion has different switches for its
subcommands, all switches are global—that is, each
switch is guaranteed to mean the same thing regardless of
the subcommand you use it with. For example,
@@ -49,25 +72,37 @@
means <quote>verbose output</quote>, regardless of the
subcommand you use it with.</para>
+ <para>Nonostante che Subversion ha differente opzioni per i suoi
+ sottocomandi, tutte le opzioni sono globali—cioè, ogni
+ opzione è garantita di avere lo stesso significato usata con qualunque
+ sottocomando. Per esempio, opzione <option>--verbose</option> (<option>-v</option>) sempre significa <quote>output prolisso</quote>, non guardando con quale sottocomando è usata.</para>
+
<variablelist>
-
+
<varlistentry>
<term><option>--auto-props</option></term>
<listitem>
- <para>Enables auto-props, overriding the
+ <para lang="en">Enables auto-props, overriding the
<literal>enable-auto-props</literal> directive in the
<filename>config</filename> file.</para>
+ <para>Abilita auto-props, sovrascrivendo direttiva
+ <literal>enable-auto-props</literal> del file
+ <filename>config</filename>.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--config-dir</option>
<replaceable>DIR</replaceable></term>
<listitem>
- <para>Instructs Subversion to read configuration
+ <para lang="en">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>
+ <para>Istruisce Subversion di leggere informazioni di configurazione
+ dalla cartella specificata al posto della locazione predefinita
+ (<filename>.subversion</filename> nella cartella personale del
+ utente).</para>
</listitem>
</varlistentry>
@@ -75,7 +110,7 @@
<term><option>--diff-cmd</option>
<replaceable>CMD</replaceable></term>
<listitem>
- <para>Specifies an external program to use to show
+ <para lang="en">Specifies an external program to use to show
differences between files. When <command>svn
diff</command> is invoked, it uses Subversion's internal
diff engine, which provides unified diffs by default.
@@ -83,45 +118,69 @@
<option>--diff-cmd</option>. You can pass switches to
the diff program with the <option>--extensions</option>
switch (more on that later in this section).</para>
+ <para>Specifica un programma esterno da usare per mostrare le
+ differenze tra i file. Quando è usato comando <command>svn
+ diff</command>, si usa algoritmo diff interno di Subversion,
+ che fornisce come predifinito il formato 'unified diffs'.
+ Se volete impiegare programma diff esterno, usate
+ <option>--diff-cmd</option>. Potete passargli varie sue opzioni
+ con la opzione <option>--extensions</option>
+ (vedi più avanti in questa sezione).</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--diff3-cmd</option>
<replaceable>CMD</replaceable></term>
<listitem>
- <para>Specifies an external program to use to merge files.</para>
+ <para lang="en">Specifies an external program to use to merge files.</para>
+ <para>Specifica un programma esterno per fondere i file.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--dry-run</option></term>
<listitem>
- <para>Goes through all the motions of running a command,
+ <para lang="en">Goes through all the motions of running a command,
but makes no actual changes—either on disk or in
the repository.</para>
+ <para>Fa tutte le mosse del comando senza fare le modifiche
+ davvero—sul disco o nel deposito.
+ <footnote>
+ <para>Ndt. letteralmente 'a secco'</para>
+ </footnote></para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--editor-cmd</option>
<replaceable>CMD</replaceable></term>
<listitem>
- <para>Specifies an external program to use to edit a log message
+ <para lang="en">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>
+ <para>Specifica un programma esterno per editare messaggi di log
+ o valori delle proprietà. Vedi la sezione
+ <literal>editor-cmd</literal> nella
+ <xref linkend="svn.advanced.confarea.opts.config"/>
+ per modi di specificare un editore predefinito.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--encoding</option> <replaceable>ENC</replaceable></term>
<listitem>
- <para>Tells Subversion that your commit message is encoded
+ <para lang="en">Tells Subversion that your commit message is encoded
in the charset provided. The default is your operating
system's native locale, and you should specify the
encoding if your commit message is in any other
encoding.</para>
+ <para>Dice a Subversion che i vostri messaggi di commit sono
+ codificati con un insieme di caratteri specificato.
+ Come predefinito è 'locale' nativo del vostro sistema operativo
+ e qui potete specificare quando volete codificare i mesaggi
+ diversamente.</para>
</listitem>
</varlistentry>
@@ -129,7 +188,7 @@
<term><option>--extensions</option> (<option>-x</option>)
<replaceable>ARGS</replaceable></term>
<listitem>
- <para>Specifies an argument or arguments that Subversion
+ <para lang="en">Specifies an argument or arguments that Subversion
should pass to an external diff command when providing
differences between files. If you wish to pass multiple
arguments, you must enclose all of them in quotes (for
@@ -137,23 +196,32 @@
"-b -E"</command>). This switch can
<emphasis>only</emphasis> be used if you also pass the
<option>--diff-cmd</option> switch.</para>
+ <para>Specifica un argomento o argomenti che Subversion
+ dovrebbe passare al programma esterno diff che fornisce
+ differenze tra i file. Se volete passare più argomenti,
+ devono essere racchiusi tra dopii appici (per
+ esempio, <command>svn diff --diff-cmd /usr/bin/diff -x
+ "-b -E"</command>). Questa opzione può essere usata
+ <emphasis>solo</emphasis> con la opzione
+ <option>--diff-cmd</option>.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--file</option> (<option>-F</option>)
<replaceable>FILENAME</replaceable>
</term>
<listitem>
- <para>Uses the contents of the file passed as an argument
+ <para lang="en">Uses the contents of the file passed as an argument
to this switch for the specified subcommand.</para>
+ <para>Per sottocomando specificato usa contenuto di file <replaceable>FILENAME</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--force</option></term>
<listitem>
- <para>Forces a particular command or operation to run.
+ <para lang="en">Forces a particular command or operation to run.
There are some operations that Subversion will prevent
you from doing in normal usage, but you can pass the
force switch to tell Subversion <quote>I know what I'm
@@ -162,13 +230,22 @@
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>
+ <para>Forza svolgimento di un particolare comando o operazione.
+ Ci sono alcune operazioni particolari dove Subversion
+ non vi permette di farle durante normale uso, ma potete
+ passargli questa opzione per dire <quote>So che cosa sto facendo
+ e sono consapevole di eventuali conseguenze, allora lasciami
+ fare</quote>. Questa opzione è equivalente programmatico
+ del fare da sè lavori su impianto elettrico senza togliere
+ la corrente—se non sapete che cosa state facendo,
+ potete prendere una bella scossa.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--force-log</option></term>
<listitem>
- <para>Forces a suspicious parameter passed to the
+ <para lang="en">Forces a suspicious parameter passed to the
<option>--message</option> (<option>-m</option>) or
<option>--file</option> (<option>-F</option>) options to
be accepted as valid. By default, Subversion will
@@ -181,22 +258,43 @@
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
+ of errors, pass the <option>--force-log</option> option
to subcommands that accept log messages.</para>
+ <para>Forza accetazione come valido di un parametro sospetto,
+ passato con la opzione
+ <option>--message</option> (<option>-m</option>) o
+ <option>--file</option> (<option>-F</option>).
+ Comportamento predefinito: Subversion produrrà un errore
+ se i parametri per queste opzioni sembrano essere le
+ destinazioni del sottocomando. Per esempio, se passate
+ un file, sottoposto al controllo delle versioni,
+ con la opzione
+ <option>--file</option> (<option>-F</option>),
+ Subversion suppone che avete sbagliato, che il file era
+ inteso come destinazione del sottocomando e voi avete
+ dimenticato di scrivere altro file, questa volta non
+ versionato, come sorgente del vostro messaggio.
+ Per affermare la vostra scelta e sovrascrivere questi
+ tipi di errori, passate la opzione
+ <option>--force-log</option>
+ a sottocomando che accetta messagi di log.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--help</option> (<option>-h</option> or
<option>-?</option>)
</term>
<listitem>
- <para>If used with one or more subcommands, shows the
+ <para lang="en">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>
+ <para>Se usato con uno o più sottocomandi, mostra testo di aiuto
+ incorporato per ogni sottocomando. Usato da solo mostra il testo
+ di aiuto del cliente.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--ignore-ancestry</option></term>
<listitem>
@@ -204,7 +302,7 @@
differences (rely on path contents alone).</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--ignore-externals</option></term>
<listitem>
@@ -212,7 +310,7 @@
the external working copies managed by them.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--incremental</option></term>
<listitem>
@@ -220,7 +318,7 @@
concatenation.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--limit</option>
<replaceable>NUM</replaceable></term>
@@ -229,7 +327,7 @@
log messages.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--message</option> (<option>-m</option>)
<replaceable>MESSAGE</replaceable>
@@ -238,13 +336,13 @@
<para>Indicates that you will specify a commit message
on the command line, following this switch. For
example:</para>
-
+
<screen>
$ svn commit -m "They don't make Sunday."
</screen>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--new</option> <replaceable>ARG</replaceable></term>
<listitem>
@@ -252,7 +350,7 @@
target.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--no-auth-cache</option></term>
<listitem>
@@ -261,7 +359,7 @@
administrative directories.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--no-auto-props</option></term>
<listitem>
@@ -281,7 +379,7 @@
contents of an existing (empty) file.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--no-diff-deleted</option></term>
<listitem>
@@ -292,7 +390,7 @@
the file but removed all the content.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--no-ignore</option></term>
<listitem>
@@ -327,7 +425,7 @@
than to prompt for more information.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--non-recursive</option> (<option>-N</option>)</term>
<listitem>
@@ -342,7 +440,7 @@
<varlistentry>
<term><option>--notice-ancestry</option></term>
<listitem>
- <para>Pay attention to ancestry when calculating
+ <para>Pay attention to ancestry when calculating
differences.</para>
</listitem>
</varlistentry>
@@ -354,7 +452,7 @@
target.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--password</option>
<replaceable>PASS</replaceable></term>
@@ -365,7 +463,7 @@
it.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--quiet</option> (<option>-q</option>)</term>
<listitem>
@@ -373,7 +471,7 @@
information while performing an operation.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--recursive</option> (<option>-R</option>)</term>
<listitem>
@@ -381,7 +479,7 @@
Most subcommands recurse by default.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--relocate</option> <replaceable>FROM TO
[PATH...]</replaceable></term>
@@ -395,7 +493,7 @@
example.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--revision</option> (<option>-r</option>)
<replaceable>REV</replaceable>
@@ -421,7 +519,7 @@
information.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--revprop</option></term>
<listitem>
@@ -434,7 +532,7 @@
unversioned properties.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--show-updates</option> (<option>-u</option>)</term>
<listitem>
@@ -446,7 +544,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--stop-on-copy</option></term>
<listitem>
@@ -458,7 +556,7 @@
encountered.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--strict</option></term>
<listitem>
@@ -467,7 +565,7 @@
subcommands.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--targets</option>
<replaceable>FILENAME</replaceable></term>
@@ -478,7 +576,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--username</option>
<replaceable>NAME</replaceable></term>
@@ -489,7 +587,7 @@
it.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--verbose</option> (<option>-v</option>)</term>
<listitem>
@@ -500,7 +598,7 @@
additional information regarding its actions.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--version</option></term>
<listitem>
@@ -511,18 +609,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.ref.svn.c">
<title><command>svn</command> Subcommands</title>
@@ -534,12 +632,12 @@
</refnamediv>
<refsect1>
- <title>Synopsis</title>
+ <title>Synopsis</title>
<programlisting>svn add PATH...</programlisting>
</refsect1>
<refsect1>
<title>Description</title>
-
+
<para>Add files, directories, or symbolic links to your
working copy and schedule them for addition to the
repository. They will be uploaded and added to the
@@ -547,12 +645,12 @@
change your mind 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>
@@ -562,7 +660,7 @@
<title>Accesses Repository</title>
<para>No</para>
</refsect1>
-
+
<refsect1>
<title>Switches</title>
@@ -576,20 +674,20 @@
--force
</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
<command>svn add</command> is to recurse:</para>
-
+
<screen>
$ svn add testdir
A testdir
@@ -601,7 +699,7 @@
<para>You can add a directory without adding its
contents:</para>
-
+
<screen>
$ svn add --non-recursive otherdir
A otherdir
@@ -638,7 +736,7 @@
</refsect1>
<refsect1>
<title>Description</title>
-
+
<para>Show author and revision information in-line for the
specified files or URLs. Each line of text is annotated
at the beginning with the author (username) and the
@@ -701,7 +799,7 @@
</refsect1>
<refsect1>
<title>Description</title>
-
+
<para>Output the contents of the specified files or URLs.
For listing the contents of directories, see <command>svn
list</command>.</para>
@@ -757,13 +855,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>
@@ -778,7 +876,7 @@
</refsect1>
<refsect1>
<title>Description</title>
-
+
<para>Check out a working copy from a repository. If
<replaceable>PATH</replaceable> is omitted, the
basename of the URL will be used as the destination.
@@ -806,7 +904,7 @@
<refsect1>
<title>Switches</title>
-
+
<screen>
--revision (-r) REV
--quiet (-q)
@@ -819,7 +917,7 @@
--config-dir DIR
</screen>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
@@ -1007,11 +1105,11 @@
</refsect1>
-
+
<refsect1>
<title>Alternate Names</title>
- <para>ci (short for <quote>check in</quote>; not
- <quote>co</quote>, which is short for
+ <para>ci (short for <quote>check in</quote>; not
+ <quote>co</quote>, which is short for
<quote>checkout</quote>)</para>
</refsect1>
@@ -1052,7 +1150,7 @@
commit message on the command line and an implicit
target of your current directory
(<quote><filename>.</filename></quote>):</para>
-
+
<screen>
$ svn commit -m "added howto section."
Sending a
@@ -1096,7 +1194,7 @@
Committed revision 7.
</screen>
-
+
</refsect1>
</refentry>
@@ -1114,12 +1212,12 @@
<refsect1>
<title>Description</title>
-
+
<para>Copy a file in a working copy or in the repository.
<replaceable>SRC</replaceable> and
<replaceable>DST</replaceable> can each be either a
working copy (WC) path or URL:</para>
-
+
<variablelist>
<varlistentry>
@@ -1330,7 +1428,7 @@
--config-dir DIR
</screen>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
@@ -1362,15 +1460,15 @@
that has local mods:</para>
<screen>
-$ svn delete over-there
+$ svn delete over-there
svn: Attempting restricted operation for modified resource
svn: Use --force to override this restriction
svn: 'over-there' has local modifications
-$ svn delete --force over-there
+$ svn delete --force over-there
D over-there
</screen>
-
+
</refsect1>
</refentry>
@@ -1532,22 +1630,22 @@
diff</command>):</para>
<screen>
-$ svn diff COMMITTERS
+$ svn diff COMMITTERS
Index: COMMITTERS
===================================================================
---- COMMITTERS (revision 4404)
-+++ COMMITTERS (working copy)
+--- COMMITTERS (revision 4404)
++++ COMMITTERS (working copy)
</screen>
<para>See how your working copy's modifications compare
against an older revision:</para>
<screen>
-$ svn diff -r 3900 COMMITTERS
+$ svn diff -r 3900 COMMITTERS
Index: COMMITTERS
===================================================================
---- COMMITTERS (revision 3900)
-+++ COMMITTERS (working copy)
+--- COMMITTERS (revision 3900)
++++ COMMITTERS (working copy)
</screen>
<para>Compare revision 3000 to revision 3500 using <quote>@</quote>
@@ -1557,8 +1655,8 @@
$ svn diff http://svn.collab.net/repos/svn/trunk/COMMITTERS@3000 http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500
Index: COMMITTERS
===================================================================
---- COMMITTERS (revision 3000)
-+++ COMMITTERS (revision 3500)
+--- COMMITTERS (revision 3000)
++++ COMMITTERS (revision 3500)
…
</screen>
@@ -1570,8 +1668,8 @@
$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk/COMMITTERS
Index: COMMITTERS
===================================================================
---- COMMITTERS (revision 3000)
-+++ COMMITTERS (revision 3500)
+--- COMMITTERS (revision 3000)
++++ COMMITTERS (revision 3500)
</screen>
@@ -1595,27 +1693,27 @@
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)
-+++ COMMITTERS (revision 3500)
+--- COMMITTERS (revision 3000)
++++ COMMITTERS (revision 3500)
</screen>
<para>Use <option>--diff-cmd</option>
<replaceable>CMD</replaceable> <option>-x</option> to
pass arguments directly to the external diff
program</para>
-
+
<screen>
-$ svn diff --diff-cmd /usr/bin/diff -x "-i -b" COMMITTERS
+$ svn diff --diff-cmd /usr/bin/diff -x "-i -b" COMMITTERS
Index: COMMITTERS
===================================================================
0a1,2
> This is a test
->
+>
</screen>
-
+
</refsect1>
</refentry>
@@ -1741,7 +1839,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>
@@ -1770,7 +1868,7 @@
<refentry id="svn.ref.svn.c.import">
<refnamediv>
<refname>svn import</refname>
- <refpurpose>Commit an unversioned file or tree into the
+ <refpurpose>Commit an unversioned file or tree into the
repository.</refpurpose>
</refnamediv>
<refsect1>
@@ -1858,14 +1956,14 @@
<emphasis>not</emphasis> under version control. To start
working, you still need to <command>svn checkout</command>
a fresh working copy of the tree.</para>
-
+
</refsect1>
</refentry>
<refentry id="svn.ref.svn.c.info">
<refnamediv>
<refname>svn info</refname>
- <refpurpose>Display information about a local or remote
+ <refpurpose>Display information about a local or remote
item.</refpurpose>
</refnamediv>
<refsect1>
@@ -1990,7 +2088,7 @@
</screen>
-
+
</refsect1>
</refentry>
@@ -2102,7 +2200,7 @@
<refentry id="svn.ref.svn.c.lock">
<refnamediv>
- <refname>svn lock</refname>
+ <refname>svn lock</refname>
<refpurpose>Lock working copy paths or URLs in the
repository, so that no other user can commit changes to
them.</refpurpose>
@@ -2347,10 +2445,10 @@
<screen>
$ svn log -r 14:15
------------------------------------------------------------------------
-r14 | ...
+r14 | ...
------------------------------------------------------------------------
-r15 | ...
+r15 | ...
------------------------------------------------------------------------
</screen>
@@ -2365,15 +2463,15 @@
$ svn log -r 27 >> mylog
$ cat mylog
------------------------------------------------------------------------
-r14 | ...
+r14 | ...
------------------------------------------------------------------------
------------------------------------------------------------------------
-r19 | ...
+r19 | ...
------------------------------------------------------------------------
------------------------------------------------------------------------
-r27 | ...
+r27 | ...
------------------------------------------------------------------------
</screen>
@@ -2388,13 +2486,13 @@
$ svn log --incremental -r 27 >> mylog
$ cat mylog
------------------------------------------------------------------------
-r14 | ...
+r14 | ...
------------------------------------------------------------------------
-r19 | ...
+r19 | ...
------------------------------------------------------------------------
-r27 | ...
+r27 | ...
</screen>
<para>The <option>--incremental</option> switch provides
@@ -2417,9 +2515,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
------------------------------------------------------------------------
r20 | sally | 2003-01-17 22:56:19 -0600 (Fri, 17 Jan 2003) | 1 line
@@ -2533,12 +2631,12 @@
U myproj/thhgttg.txt
…
</screen>
-
+
<para>To merge changes to a single file:</para>
<screen>
$ cd myproj
-$ svn merge -r 30:31 thhgttg.txt
+$ svn merge -r 30:31 thhgttg.txt
U thhgttg.txt
</screen>
@@ -2620,7 +2718,7 @@
Committed revision 26.
</screen>
-
+
</refsect1>
</refentry>
@@ -2795,7 +2893,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>
@@ -2860,7 +2958,7 @@
modify properties that have multiple values:</para>
<screen>
-$ svn propedit svn:keywords foo.c
+$ svn propedit svn:keywords foo.c
<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
@@ -2929,7 +3027,7 @@
<para>Examine a property of a file in your working
copy:</para>
-
+
<screen>
$ svn propget svn:keywords foo.c
Author
@@ -2940,10 +3038,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>
@@ -2997,7 +3095,7 @@
--config-dir DIR
</screen>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
@@ -3023,7 +3121,7 @@
svn:keywords : Author Date Rev
owner : sally
</screen>
-
+
</refsect1>
</refentry>
@@ -3097,7 +3195,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>
@@ -3129,7 +3227,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'
@@ -3140,7 +3238,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>
@@ -3205,10 +3303,10 @@
--config-dir DIR
</screen>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
-
+
<para>If you get a conflict on an update, your working
copy will sprout three new files:</para>
@@ -3360,12 +3458,12 @@
<para>The first six columns in the output are each one
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>
@@ -3409,7 +3507,7 @@
<listitem>
<para>The contents (as opposed to the properties) of
the item conflict with updates received from the
- repository.</para>
+ repository.</para>
</listitem>
</varlistentry>
@@ -3423,7 +3521,7 @@
<varlistentry>
<term>'I'</term>
<listitem>
- <para>Item is being ignored (e.g. with the
+ <para>Item is being ignored (e.g. with the
<literal>svn:ignore</literal> property).</para>
</listitem>
</varlistentry>
@@ -3460,7 +3558,7 @@
directory's properties.</para>
<variablelist>
-
+
<varlistentry>
<term>' '</term>
<listitem>
@@ -3492,14 +3590,14 @@
<xref linkend="svn.tour.other.cleanup"/>.)</para>
<variablelist>
-
+
<varlistentry>
<term>' '</term>
<listitem>
<para>Item is not locked.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>'L'</term>
<listitem>
@@ -3511,16 +3609,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>
@@ -3535,14 +3633,14 @@
linkend="svn.branchmerge.switchwc"/>).</para>
<variablelist>
-
+
<varlistentry>
<term>' '</term>
<listitem>
<para>Item is a child of its parent directory.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>'S'</term>
<listitem>
@@ -3553,9 +3651,9 @@
</variablelist>
<para>The sixth column is populated with lock information.</para>
-
+
<variablelist>
-
+
<varlistentry>
<term>' '</term>
<listitem>
@@ -3573,7 +3671,7 @@
<para>File is locked in this working copy.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>O</term>
<listitem>
@@ -3614,14 +3712,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>
@@ -3636,11 +3734,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>
@@ -3792,7 +3890,7 @@
--config-dir DIR
</screen>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
@@ -3872,7 +3970,7 @@
understand exactly when one should or shouldn't use
<option>--relocate</option>. Here's the rule of
thumb:</para>
-
+
<itemizedlist>
<listitem><para>If the working copy needs to reflect a
new directory <emphasis>within</emphasis> the
@@ -3892,7 +3990,7 @@
<refentry id="svn.ref.svn.c.unlock">
<refnamediv>
- <refname>svn unlock</refname>
+ <refname>svn unlock</refname>
<refpurpose>Unlock working copy paths or URLs.</refpurpose>
</refnamediv>
<refsect1>
@@ -4115,11 +4213,11 @@
single file, you may want to use <command>svn
cat</command>.</para>
</tip>
-
+
</refsect1>
</refentry>
</sect2>
-
+
</sect1>
<!-- ================================================================= -->
@@ -4127,7 +4225,7 @@
<!-- ================================================================= -->
<sect1 id="svn.ref.svnadmin">
<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
@@ -4136,13 +4234,13 @@
<para>Since <command>svnadmin</command> works via direct repository access
(and thus can only be used on the machine that holds the
repository), it refers to the repository with a path, not a URL.</para>
-
+
<!-- =============================================================== -->
<sect2 id="svn.ref.svnadmin.sw">
- <title><command>svnadmin</command> Switches</title>
-
+ <title><command>svnadmin</command> Switches</title>
+
<variablelist>
-
+
<varlistentry>
<term><option>--bdb-log-keep</option></term>
<listitem>
@@ -4150,7 +4248,7 @@
of database log files.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--bdb-txn-nosync</option></term>
<listitem>
@@ -4158,7 +4256,7 @@
committing database transactions.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--bypass-hooks</option></term>
<listitem>
@@ -4301,7 +4399,7 @@
<screen>
$ svnadmin create /usr/local/svn/repos
</screen>
-
+
<para>In Subversion 1.0, a Berkeley DB repository is always
created. In Subversion 1.1, a Berkeley DB repository is
the default repository type, but an FSFS repository can be
@@ -4340,7 +4438,7 @@
</refsect1>
<refsect1>
<title>Switches</title>
-
+
<screen>
--revision (-r)
--quiet
@@ -4411,7 +4509,7 @@
</refsect1>
<refsect1>
<title>Switches</title>
-
+
<screen>
--revision (-r)
--incremental
@@ -4419,7 +4517,7 @@
--deltas
</screen>
</refsect1>
-
+
<refsect1>
<title>Examples</title>
@@ -4439,7 +4537,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
@@ -4503,7 +4601,7 @@
<refsect1>
<title>Switches</title>
-
+
<screen>
--clean-logs
</screen>
@@ -4563,7 +4661,7 @@
<refsect1>
<title>Examples</title>
-
+
<para>Remove all unused log files from a repository:</para>
<screen>
@@ -4599,7 +4697,7 @@
<refsect1>
<title>Switches</title>
-
+
<screen>
--quiet (-q)
--ignore-uuid
@@ -4640,7 +4738,7 @@
<refentry id="svn.ref.svnadmin.c.lslocks">
<refnamediv>
- <refname>svnadmin lslocks</refname>
+ <refname>svnadmin lslocks</refname>
<refpurpose>Print descriptions of all locks.</refpurpose>
</refnamediv>
<refsect1>
@@ -4655,7 +4753,7 @@
<refsect1>
<title>Switches</title>
-
+
<para>None</para>
</refsect1>
@@ -4672,7 +4770,7 @@
UUID Token: opaquelocktoken:ab00ddf0-6afb-0310-9cd0-dda813329753
Owner: harry
Created: 2005-07-08 17:27:36 -0500 (Fri, 08 Jul 2005)
-Expires:
+Expires:
Comment (1 line):
Rework the uppermost branches on the bald cypress in the foreground.
</screen>
@@ -4704,7 +4802,7 @@
repository.</para>
<screen>
-$ svnadmin lstxns /usr/local/svn/repos/
+$ svnadmin lstxns /usr/local/svn/repos/
1w
1x
</screen>
@@ -4741,11 +4839,11 @@
</refsect1>
<refsect1>
<title>Examples</title>
-
+
<para>Recover a hung repository:</para>
<screen>
-$ svnadmin recover /usr/local/svn/repos/
+$ svnadmin recover /usr/local/svn/repos/
Repository lock acquired.
Please wait; recovering the repository may take some time...
@@ -4805,7 +4903,7 @@
<refsect1>
<title>Switches</title>
-
+
<para>None</para>
</refsect1>
@@ -4845,7 +4943,7 @@
<refsect1>
<title>Switches</title>
-
+
<screen>
--quiet (-q)
</screen>
@@ -4947,11 +5045,11 @@
<refsect1>
<title>Examples</title>
-
+
<para>Verify a hung repository:</para>
<screen>
-$ svnadmin verify /usr/local/svn/repos/
+$ svnadmin verify /usr/local/svn/repos/
* Verified revision 1729.
</screen>
@@ -4961,13 +5059,13 @@
</sect2>
</sect1>
-
+
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.ref.svnlook">
<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—it's just
@@ -4983,11 +5081,11 @@
<para>If no revision or transaction is specified,
<command>svnlook</command> defaults to the youngest (most
recent) revision of the repository.</para>
-
+
<!-- =============================================================== -->
<sect2 id="svn.ref.svnlook.sw">
<title><command>svnlook</command> Switches</title>
-
+
<para>Switches in <command>svnlook</command> are global, just
like in <command>svn</command> and
<command>svnadmin</command>; however, most switches only
@@ -5073,7 +5171,7 @@
<refsect1>
<title>Switches</title>
-
+
<screen>
--revision (-r)
--transaction (-t)
@@ -5087,9 +5185,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>
@@ -5123,7 +5221,7 @@
<title>Examples</title>
<para>This shows the contents of a file in transaction
- <literal>ax8</literal>, located at
+ <literal>ax8</literal>, located at
<filename>/trunk/README</filename>:</para>
<screen>
@@ -5141,7 +5239,7 @@
III. PARTICIPATING IN THE SUBVERSION COMMUNITY
…
</screen>
-
+
</refsect1>
</refentry>
@@ -5163,7 +5261,7 @@
columns:</para>
<variablelist>
-
+
<varlistentry>
<term>'<literal>A </literal>'</term>
<listitem>
@@ -5233,7 +5331,7 @@
UU trunk/vendors/baker/pretzel.txt
D trunk/vendors/baker/baguette.txt
</screen>
-
+
</refsect1>
</refentry>
@@ -5261,14 +5359,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>
@@ -5294,7 +5392,7 @@
<refsect1>
<title>Switches</title>
-
+
<screen>
--revision (-r)
--transaction (-t)
@@ -5305,7 +5403,7 @@
<refsect1>
<title>Examples</title>
-
+
<para>This shows a newly added (empty) file, a deleted
file, and a copied file:</para>
@@ -5318,8 +5416,8 @@
Modified: trunk/vendors/deli/sandwich.txt
==============================================================================
---- trunk/vendors/deli/sandwich.txt (original)
-+++ trunk/vendors/deli/sandwich.txt 2003-02-22 17:45:04.000000000 -0600
+--- trunk/vendors/deli/sandwich.txt (original)
++++ trunk/vendors/deli/sandwich.txt 2003-02-22 17:45:04.000000000 -0600
@@ -0,0 +1 @@
+Don't forget the mayo!
@@ -5333,7 +5431,7 @@
Deleted: trunk/vendors/deli/pickle.txt
==============================================================================
</screen>
-
+
<para>If a file has a non-textual
<literal>svn:mime-type</literal> property, then the
differences are not explicitly shown.</para>
@@ -5376,7 +5474,7 @@
$ svnlook dirs-changed -r 40 /usr/local/svn/repos
trunk/vendors/deli/
</screen>
-
+
</refsect1>
</refentry>
@@ -5458,7 +5556,7 @@
2 /trunk <1.0.3>
1 /trunk <1.0.2>
</screen>
-
+
</refsect1>
</refentry>
@@ -5501,7 +5599,7 @@
15
Rearrange lunch.
</screen>
-
+
</refsect1>
</refentry>
@@ -5527,7 +5625,7 @@
<refsect1>
<title>Switches</title>
-
+
<para>None</para>
</refsect1>
@@ -5542,11 +5640,11 @@
UUID Token: opaquelocktoken:ab00ddf0-6afb-0310-9cd0-dda813329753
Owner: harry
Created: 2005-07-08 17:27:36 -0500 (Fri, 08 Jul 2005)
-Expires:
+Expires:
Comment (1 line):
Rework the uppermost branches on the bald cypress in the foreground.
</screen>
-
+
</refsect1>
</refentry>
@@ -5568,16 +5666,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>
@@ -5585,7 +5683,7 @@
$ svnlook log /tmp/repos/
Rearrange lunch.
</screen>
-
+
</refsect1>
</refentry>
@@ -5692,7 +5790,7 @@
original-author : fitz
svn:mime-type : text/plain
</screen>
-
+
</refsect1>
</refentry>
@@ -5725,7 +5823,7 @@
<refsect1>
<title>Examples</title>
-
+
<para>This shows the tree output (with node-IDs) for revision
40 in our sample repository:</para>
@@ -5739,7 +5837,7 @@
soda.txt <1k.0.2j>
sandwich.txt <1j.0.2j>
</screen>
-
+
</refsect1>
</refentry>
@@ -5767,7 +5865,7 @@
<refsect1>
<title>Examples</title>
- <screen>
+ <screen>
$ svnlook uuid /usr/local/svn/repos
e7fe1b91-8cd5-0310-98dd-2f12e793c5e8
</screen>
@@ -5796,8 +5894,8 @@
<para>This shows the youngest revision of our sample
repository:</para>
- <screen>
-$ svnlook youngest /tmp/repos/
+ <screen>
+$ svnlook youngest /tmp/repos/
42
</screen>
@@ -5813,7 +5911,7 @@
<sect1 id="svn.ref.svnserve">
<title><command>svnserve</command></title>
-
+
<para><command>svnserve</command> allows access to Subversion
repositories using the <literal>svn</literal> network protocol.
You can run svnserve either as a standalone server process, or
@@ -5828,11 +5926,11 @@
authentication database to use and what authorization policies
to apply. See <xref linkend="svn.serverconfig.svnserve"/> for details of
the <filename>svnserve.conf</filename> file.</para>
-
+
<!-- =============================================================== -->
<sect2 id="svn.ref.svnserve.sw">
<title><command>svnserve</command> Switches</title>
-
+
<para>Unlike the previous commands we've
described. <command>svnserve</command> has no
subcommands—<command>svnserve</command> is controlled
@@ -5973,7 +6071,7 @@
<sect1 id="svn.ref.svnversion">
<title><command>svnversion</command></title>
-
+
<refentry id="svn.ref.svnversion.re">
<refnamediv>
<refname>svnversion</refname>
@@ -6011,14 +6109,14 @@
has switches.</para>
<variablelist>
-
+
<varlistentry>
<term><option>--no-newline</option> (<option>-n</option>)</term>
<listitem>
<para>Omit the usual trailing newline from the output.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--committed</option> (<option>-c</option>)</term>
<listitem>
@@ -6026,14 +6124,14 @@
current (i.e., highest locally available) revisions.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--help</option> (<option>-h</option>)</term>
<listitem>
<para>Print a help summary.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><option>--version</option></term>
<listitem>
@@ -6074,7 +6172,7 @@
4168M</screen>
<para>If the working copy is switched, a trailing "S" is
- added:</para>
+ added:</para>
<screen>$ svnversion .
4168S</screen>
@@ -6103,14 +6201,14 @@
<sect1 id="svn.ref.mod_dav_svn">
<title><command>mod_dav_svn</command></title>
-
+
<refentry id="svn.ref.mod_dav_svn.conf">
<refnamediv>
<refname><literal>mod_dav_svn</literal> Configuration
Directives</refname> <refpurpose>Apache configuration
directives for serving Subversion repositories through Apache
- HTTP Server.</refpurpose>
+ HTTP Server.</refpurpose>
</refnamediv>
@@ -6128,7 +6226,7 @@
<title>Directives</title>
<variablelist>
-
+
<varlistentry>
<term><literal>DAV svn</literal></term>
<listitem>
@@ -6450,7 +6548,7 @@
</chapter>
<!--
-local variables:
+local variables:
sgml-parent-document: ("book.xml" "chapter")
end:
-->
More information about the svnbook-dev
mailing list