[svnbook] r4653 committed - Translation: subcommands up to svn export
svnbook at googlecode.com
svnbook at googlecode.com
Sun Feb 9 18:12:09 CST 2014
Revision: 4653
Author: jmfelderhoff at gmx.eu
Date: Sun Feb 9 21:21:44 2014 UTC
Log: Translation: subcommands up to svn export
http://code.google.com/p/svnbook/source/detail?r=4653
Modified:
/branches/1.6/de/book/ch09-reference.xml
=======================================
--- /branches/1.6/de/book/ch09-reference.xml Sun Feb 9 15:27:30 2014 UTC
+++ /branches/1.6/de/book/ch09-reference.xml Sun Feb 9 21:21:44 2014 UTC
@@ -3218,12 +3218,15 @@
<indexterm>
<primary>svn</primary>
+<!--
+ <secondary>subcommands</secondary>
+-->
<secondary>Unterbefehle</secondary>
<tertiary>diff</tertiary>
</indexterm>
<refnamediv>
- <refname>svn diff</refname>
+ <refname>svn diff (di)</refname>
<!--
<refpurpose>This displays the differences between two revisions
or paths.</refpurpose>
-->
@@ -3235,9 +3238,9 @@
<title>Synopsis</title>
-->
<title>Aufruf</title>
- <programlisting>diff [-c M | -r N[:M]]
[TARGET[@REV]...]</programlisting>
- <programlisting>diff [-r N[:M]] --old=OLD-TGT[@OLDREV]
[--new=NEW-TGT[@NEWREV]] [PATH...]</programlisting>
- <programlisting>diff OLD-URL[@OLDREV]
NEW-URL[@NEWREV]</programlisting>
+ <para><literal>diff [-c M | -r N[:M]]
[TARGET[@REV]...]</literal></para>
+ <para><literal>diff [-r N[:M]] --old=OLD-TGT[@OLDREV]
[--new=NEW-TGT[@NEWREV]] [PATH...]</literal></para>
+ <para><literal>diff OLD-URL[@OLDREV]
NEW-URL[@NEWREV]</literal></para>
</refsect1>
<refsect1>
@@ -3246,17 +3249,15 @@
-->
<title>Beschreibung</title>
- <itemizedlist>
-
- <listitem>
<!--
- <para>Display the differences between two paths. You can
- use <command>svn diff</command> in the following ways:</para>
+ <para>Display the differences between two paths. You can
+ use <command>svn diff</command> in the following ways:</para>
-->
- <para>Anzeige der Unterschiede zwischen zwei Pfaden. Sie
- können <command>svn diff</command> wie folgt
- verwenden: </para>
- </listitem>
+ <para>Anzeige der Unterschiede zwischen zwei Pfaden. Sie
+ können <command>svn diff</command> wie folgt verwenden:
+ </para>
+
+ <itemizedlist>
<listitem>
<!--
@@ -3391,34 +3392,38 @@
<!--
<para>If <replaceable>TARGET</replaceable> is a URL, then
- revs <literal>N</literal> and <literal>M</literal> can be
given either via the
- <option>- -revision</option> option or by using the
+ revs <literal>N</literal> and <literal>M</literal> can be
+ given either via the
+ <option>- -revision</option> (<option>-r</option>) option
+ or by using the
<quote>@</quote> notation as described earlier.</para>
-->
<para>Falls <replaceable>TARGET</replaceable> ein URL ist,
können die Revisionen <literal>N</literal> und
<literal>M</literal> entweder mir der Option
- <option>--revision</option> oder in der Notation
- <quote>@</quote> angegeben werden, wie vorher
+ <option>--revision</option> (<option>-r</option>) oder in
+ der Notation <quote>@</quote> angegeben werden, wie vorher
beschrieben.</para>
<!--
<para>If <replaceable>TARGET</replaceable> is a working copy
path, the default behavior (when no
- <option>- -revision</option> option is provided) is to
- display the differences between the base and working
- copies of <replaceable>TARGET</replaceable>. If a
- <option>- -revision</option> option is specified in this
- scenario, though, it means:</para>
+ <option>- -revision</option> (<option>-r</option>) option
+ is provided) is to display the differences between the
+ base and working copies
+ of <replaceable>TARGET</replaceable>. If a
+ <option>- -revision</option> (<option>-r</option>) option
+ is specified in this scenario, though, it means:</para>
-->
<para>Falls es sich bei <replaceable>TARGET</replaceable> um
einen Pfad in der Arbeitskopie handelt, besteht das
Standardverhalten (sofern die Option
- <option>--revision</option> nicht angegeben wird) darin,
- die Unterschiede zwischen der Basisversion und der
- Arbeitskopie von <replaceable>TARGET</replaceable>
- auszugeben. Wird in diesem Fall jedoch die Option
- <option>--revision</option> angegeben, bedeutet das:
+ <option>--revision</option> (<option>-r</option>) nicht
+ angegeben wird) darin, die Unterschiede zwischen der
+ Basisversion und der Arbeitskopie von
+ <replaceable>TARGET</replaceable> auszugeben. Wird in
+ diesem Fall jedoch die Option <option>--revision</option>
+ (<option>-r</option>) angegeben, bedeutet das:
</para>
<variablelist>
@@ -3427,15 +3432,11 @@
<term><option>--revision N:M</option></term>
<listitem>
<!--
- <para>The server compares
- <replaceable>TARGET at N</replaceable>
- and
- <replaceable>TARGET at M</replaceable>.</para>
+ <para>The server compares
<replaceable>TARGET at N</replaceable>
+ and <replaceable>TARGET at M</replaceable>.</para>
-->
- <para>Der Server vergleicht
- <replaceable>TARGET at N</replaceable>
- und
- <replaceable>TARGET at M</replaceable>.</para>
+ <para>Der Server vergleicht
<replaceable>TARGET at N</replaceable>
+ und <replaceable>TARGET at M</replaceable>.</para>
</listitem>
</varlistentry>
@@ -3496,38 +3497,6 @@
als sei der gesamte Inhalt entfernt und wieder hinzugefügt
worden).</para>
- </refsect1>
- <refsect1>
-<!--
- <title>Alternate names</title>
--->
- <title>Alternativnamen</title>
- <para><command>di</command></para>
- </refsect1>
-
- <refsect1>
-<!--
- <title>Changes</title>
--->
- <title>Änderungen</title>
-<!--
- <para>Nothing</para>
--->
- <para>Nichts</para>
- </refsect1>
-
- <refsect1>
-<!--
- <title>Accesses repository</title>
--->
- <title>Projektarchiv-Zugriff</title>
-<!--
- <para>For obtaining differences against anything but
- <literal>BASE</literal> revision in your working copy</para>
--->
- <para>Beim Ermitteln von Unterschieden zu allem, was nicht
- die <literal>BASE</literal>-Revision in Ihrer Arbeitskopie
- ist</para>
</refsect1>
<refsect1>
@@ -3536,12 +3505,13 @@
-->
<title>Optionen</title>
- <screen>
+ <informalexample>
+ <screen>
--change (-c) ARG
--changelist ARG
--depth ARG
--diff-cmd CMD
---extensions (-x) "ARGS"
+--extensions (-x) ARG
--force
--new ARG
--no-diff-deleted
@@ -3551,6 +3521,7 @@
--summarize
--xml
</screen>
+ </informalexample>
</refsect1>
<refsect1>
@@ -3568,23 +3539,19 @@
Arbeitskopie (eine der beliebtesten Anwendungen von
<command>svn diff</command>):</para>
-<!--
- <screen>
+ <informalexample>
+ <screen>
$ svn diff COMMITTERS
Index: COMMITTERS
===================================================================
+<!--
- - - COMMITTERS (revision 4404)
+++ COMMITTERS (working copy)
-</screen>
-->
- <screen>
-$ svn diff COMMITTERS
-Index: COMMITTERS
-===================================================================
--- COMMITTERS (Revision 4404)
+++ COMMITTERS (Arbeitskopie)
-…
</screen>
+ </informalexample>
<!--
<para>See what changed in the file
@@ -3593,23 +3560,19 @@
<para>Betrachten der Änderungen in der Datei
<filename>COMMITTERS</filename>, Revision 9115:</para>
-<!--
- <screen>
+ <informalexample>
+ <screen>
$ svn diff -c 9115 COMMITTERS
Index: COMMITTERS
===================================================================
+<!--
- - - COMMITTERS (revision 3900)
+++ COMMITTERS (working copy)
-</screen>
-->
- <screen>
-$ svn diff -c 9115 COMMITTERS
-Index: COMMITTERS
-===================================================================
--- COMMITTERS (Revision 3900)
+++ COMMITTERS (Arbeitskopie)
-…
</screen>
+ </informalexample>
<!--
@@ -3619,23 +3582,19 @@
<para>Die Änderungen in der Arbeitskopie mit einer
älteren Revision vergleichen:</para>
-<!--
- <screen>
+ <informalexample>
+ <screen>
$ svn diff -r 3900 COMMITTERS
Index: COMMITTERS
===================================================================
+<!--
- - - COMMITTERS (revision 3900)
+++ COMMITTERS (working copy)
-</screen>
-->
- <screen>
-$ svn diff -r 3900 COMMITTERS
-Index: COMMITTERS
-===================================================================
--- COMMITTERS (Revision 3900)
+++ COMMITTERS (Arbeitskopie)
-…
</screen>
+ </informalexample>
<!--
<para>Compare revision 3000 to revision 3500 using
<quote>@</quote>
@@ -3644,26 +3603,21 @@
<para>Vergleich von Revision 3000 mit Revision 3500 unter
Verwendung der <quote>@</quote>-Syntax:</para>
-<!--
- <screen>
+ <informalexample>
+ <screen>
$ 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)
-…
-</screen>
-->
- <screen>
-$ 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)
…
</screen>
+ </informalexample>
<!--
<para>Compare revision 3000 to revision 3500 using range
@@ -3674,23 +3628,19 @@
Verwendung der Bereichsschreibweise (in diesem Fall wird
nur ein URL angegeben):</para>
-<!--
- <screen>
+ <informalexample>
+ <screen>
$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk/COMMITTERS
Index: COMMITTERS
===================================================================
+<!--
- - - COMMITTERS (revision 3000)
+++ COMMITTERS (revision 3500)
-</screen>
-->
- <screen>
-$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk/COMMITTERS
-Index: COMMITTERS
-===================================================================
--- COMMITTERS (Revision 3000)
+++ COMMITTERS (Revision 3500)
-…
</screen>
+ </informalexample>
<!--
@@ -3701,9 +3651,11 @@
Dateien in <filename>trunk</filename> unter Verwendung der
Bereichsschreibweise:</para>
- <screen>
+ <informalexample>
+ <screen>
$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk
</screen>
+ </informalexample>
<!--
@@ -3715,10 +3667,12 @@
drei Dateien in <filename>trunk</filename> unter
Verwendung der Bereichsschreibweise:</para>
- <screen>
+ <informalexample>
+ <screen>
$ svn diff -r 3000:3500 --old http://svn.collab.net/repos/svn/trunk \
COMMITTERS README HACKING
</screen>
+ </informalexample>
<!--
<para>If you have a working copy, you can obtain the
@@ -3728,27 +3682,34 @@
Unterschiede ermitteln, ohne die langen URLs
einzugeben:</para>
- <screen>
+ <informalexample>
+ <screen>
$ svn diff -r 3000:3500 COMMITTERS
Index: COMMITTERS
===================================================================
---- COMMITTERS (revision 3000)
+<!--
+- - - COMMITTERS (revision 3000)
+++ COMMITTERS (revision 3500)
+-->
+--- COMMITTERS (Revision 3000)
++++ COMMITTERS (Revision 3500)
…
</screen>
+ </informalexample>
<!--
<para>Use <option>- -diff-cmd</option>
- <replaceable>CMD</replaceable> <option>-x</option> to
- pass arguments directly to the external diff
- program:</para>
+ <replaceable>CMD</replaceable> <option>- -extensions</option>
+ (<option>-x</option>) to pass arguments directly to the
+ external diff program:</para>
-->
<para>Verwendung von <option>--diff-cmd</option>
- <replaceable>CMD</replaceable> <option>-x</option>, um
- Argumente direkt an das externe diff-Programm zu
- übergeben:</para>
+ <replaceable>CMD</replaceable> <option>--extensions</option>
+ (<option>-x</option>), um Argumente direkt an das externe
+ diff-Programm zu übergeben:</para>
- <screen>
+ <informalexample>
+ <screen>
$ svn diff --diff-cmd /usr/bin/diff -x "-i -b" COMMITTERS
Index: COMMITTERS
===================================================================
@@ -3756,6 +3717,7 @@
> This is a test
>
</screen>
+ </informalexample>
<!--
<para>Lastly, you can use the <option>- -xml</option> option
@@ -3769,7 +3731,8 @@
zwischen den Revisionen, nicht jedoch den Inhalt des
eigentlichen Diffs, in XML anzusehen:</para>
- <screen>
+ <informalexample>
+ <screen>
$ svn diff --summarize --xml http://svn.red-bean.com/repos/test@r2 \
http://svn.red-bean.com/repos/test
<?xml version="1.0"?>
@@ -3790,10 +3753,12 @@
</paths>
</diff>
</screen>
+ </informalexample>
</refsect1>
</refentry>
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
<refentry id="svn.ref.svn.c.export">
<indexterm>
More information about the svnbook-dev
mailing list