[svnbook] r4726 committed - Translation: Global Options (rest)
svnbook at googlecode.com
svnbook at googlecode.com
Tue Mar 18 05:10:37 CDT 2014
Revision: 4726
Author: jmfelderhoff at gmx.eu
Date: Tue Mar 18 10:10:21 2014 UTC
Log: Translation: Global Options (rest)
http://code.google.com/p/svnbook/source/detail?r=4726
Modified:
/branches/1.7/de/book/ch09-reference.xml
=======================================
--- /branches/1.7/de/book/ch09-reference.xml Mon Mar 17 17:01:17 2014 UTC
+++ /branches/1.7/de/book/ch09-reference.xml Tue Mar 18 10:10:21 2014 UTC
@@ -1319,39 +1319,41 @@
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry id="svn.ref.svn.sw.record_only">
<term><option>--record-only</option></term>
<listitem>
<!--
- <para>Marks revisions as merged, for use with
- <option>- -revision</option>
- (<option>-r</option>).</para>
+ <para>Enables a special mode of <command>svn
+ merge</command> in which the specified merge operation is
+ recorded in the local merge tracking information, but is
+ not actually performed.</para>
-->
- <para>Markiert Revisionen als zusammengeführt; zur
- Verwendung mit <option>--revision</option>
- (<option>-r</option>).</para>
+ <para>Schaltet einen besonderen Modus von <command>svn
+ merge</command> ein, bei dem die angegebene
+ Zusammenführung lokal vermerkt, jedoch nicht ausgeführt
+ wird.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.recursive">
<term><option>--recursive</option> (<option>-R</option>)</term>
<listitem>
<!--
<para>Makes a subcommand recurse into subdirectories.
- Most subcommands recurse by default.</para>
+ (Most subcommands recurse by default.)</para>
-->
<para>Veranlasst einen Unterbefehl, rekursiv
- Unterverzeichnisse zu durchlaufen. Die meisten
- Unterbefehle machen das standardmäßig.</para>
+ Unterverzeichnisse zu durchlaufen. (Die meisten
+ Unterbefehle machen das standardmäßig.)</para>
</listitem>
</varlistentry>
-
- <varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.reintegrate">
<term><option>--reintegrate</option></term>
<listitem>
<!--
<para>Used with the <command>svn merge</command>
- subcommand, merges all of the source URL's changes into
+ subcommand to merge all of the source URL's changes into
the working copy. See
<xref linkend="svn.branchemerge.basicmerging.stayinsync"/>
for details.</para>
@@ -1359,45 +1361,46 @@
<para>Bei Verwendung mit dem Unterbefehl <command>svn
merge</command> werden alle Änderungen des Quell-URL mit
der Arbeitskopie zusammengeführt. Für Details siehe
- <xref
- linkend="svn.branchemerge.basicmerging.stayinsync"/>.</para>
+ <xref linkend="svn.branchemerge.basicmerging.stayinsync"/>.
+ </para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term><option>--relocate</option> <replaceable>FROM TO
- [PATH...]</replaceable></term>
+
+ <varlistentry id="svn.ref.svn.sw.relocate">
+ <term><option>--relocate</option></term>
<listitem>
<!--
- <para>Used with the <command>svn switch</command>
- subcommand, changes the location of the repository that
- your working copy references. This is useful if the
- location of your repository changes and you have an
- existing working copy that you'd like to continue to
- use. See <xref linkend="svn.ref.svn.c.switch"/> for
- more details and an example.</para>
+ <para>Deprecated. When used with the <command>svn
+ switch</command> subcommand, changes the location of the
+ repository that your working copy references. The
+ preferred approach as of Subversion 1.7, however, is to
+ use the <command>svn relocate</command> subcommand. See
+ <xref linkend="svn.ref.svn.c.relocate" /> for more
+ details and an example.</para>
-->
- <para>Bei Verwendung mit dem Unterbefehl <command>svn
+ <para>Veraltet. Bei Verwendung mit dem Unterbefehl <command>svn
switch</command> wird der Ort des Projektarchivs geändert,
- auf den sich Ihre Arbeitskopie bezieht. Das ist dann
- nützlich, wenn sich der Ort Ihres Projektarchivs ändert und
- Sie eine bestehende Arbeitskopie haben, die Sie
- weiterverwenden möchten. Für weitere Details sowie ein
- Beispiel
- siehe <xref linkend="svn.ref.svn.c.switch"/>.</para>
+ auf den sich Ihre Arbeitskopie bezieht. Das bevorzugte
+ Vorgehen seit Subversion 1.7 ist jedoch, den Unterbefehl
+ <command>svn relocate</command> zu verwenden.
+ Zu weiteren Einzelheiten, siehe
+ <xref linkend="svn.ref.svn.c.relocate"/>.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term><option>--remove</option>
- <replaceable>ARG</replaceable></term>
+
+ <varlistentry id="svn.ref.svn.sw.remove">
+ <term><option>--remove</option></term>
<listitem>
<!--
- <para>Disassociates <replaceable>ARG</replaceable> from a
- changelist</para>
+ <para>Used with <command>svn changelist</command> to
+ disassociate—rather than associate (which is the
+ default operation)—the target(s) from a
+ changelist.</para>
-->
- <para>Entfernt <replaceable>ARG</replaceable> aus einer
- Änderungsliste.</para>
+ <para>In Verbindung mit <command>svn changelist</command>
+ verwendet, um das Ziel oder die Ziele aus einer
+ Änderungsliste herauszunehmen, anstatt hineinzunehmen,
+ was die Standard-Operation ist.</para>
</listitem>
</varlistentry>
@@ -1410,28 +1413,24 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term><option>--revision</option> (<option>-r</option>)
- <replaceable>REV</replaceable>
- </term>
+ <varlistentry id="svn.ref.svn.sw.revision">
+ <term><option>--revision</option> (<option>-r</option>)
<replaceable>REV</replaceable></term>
<listitem>
<!--
- <para>Indicates that you're going to supply a revision (or
- range of revisions) for a particular operation. You can
- provide revision numbers, keywords, or dates (in
- curly braces) as arguments to the revision option. If
- you wish to offer a range of revisions, you can
- provide two revisions separated by a colon. For
- example:</para>
+ <para>Specifies a revision (or range of revisions) on with
+ which to operate. You can provide revision numbers,
+ keywords, or dates (in curly braces) as arguments to the
+ revision option. If you wish to offer a range of
+ revisions, you can provide two revisions separated by a
+ colon. For example:</para>
-->
- <para>Zeigt an, dass Sie eine Revision (oder ein
- Revisionsintervall) für eine bestimmte Operation
- angeben. Sie können der Option dazu Revisionsnummern,
- Schlüsselworte oder Daten (innerhalb von geschweiften
- Klammern) als Argument übergeben. Wenn Sie ein
- Revisionsintervall angeben möchten, können Sie zwei
- durch einen Doppelpunkt getrennte Revisionen übergeben.
- Zum Beispiel:</para>
+ <para>Gibt eine Revision (oder ein Revisionsintervall) für
+ eine bestimmte Operation an. Sie können der Option dazu
+ Revisionsnummern, Schlüsselworte oder Daten (innerhalb
+ von geschweiften Klammern) als Argument übergeben. Wenn
+ Sie ein Revisionsintervall angeben möchten, können Sie
+ zwei durch einen Doppelpunkt getrennte Revisionen
+ übergeben. Zum Beispiel:</para>
<informalexample>
<screen>
@@ -1451,8 +1450,8 @@
linkend="svn.tour.revs.keywords"/>.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.revprop">
<term><option>--revprop</option></term>
<listitem>
<!--
@@ -1469,10 +1468,9 @@
(<option>-r</option>).</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term><option>--set-depth</option>
- <replaceable>ARG</replaceable></term>
+
+ <varlistentry id="svn.ref.svn.sw.set_depth">
+ <term><option>--set-depth</option>
<replaceable>ARG</replaceable></term>
<listitem>
<!--
<para>Sets the sticky depth on a directory in a working
@@ -1493,23 +1491,53 @@
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry id="svn.ref.svn.sw.show_copies_as_adds">
+ <term><option>--show-copies-as-adds</option></term>
+ <listitem>
+<!--
+ <para>Enables a special output mode for <command>svn
+ diff</command> in which the content difference for a
+ file created via a copy operation appears as it would
+ for a brand new file (with each line therein appearing
+ as an addition to an empty file) rather than as a delta
+ against the original file from which the copy was
+ created.</para>
+-->
+ <para>Bewirkt einen besonderen Ausgabemodus für
+ <command>svn diff</command>, bei dem der Unterschied des
+ Dateiinhalts für eine durch eine Kopieroperation
+ erstellte Datei aussieht, wie bei einer neuen Datei (mit
+ jeder Zeile als Ergänzung zu einer leeren Datei) statt
+ als ein Delta gegen die Originaldatei, aus der die Kopie
+ erzeugt wurde.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.show_revs">
<term><option>--show-revs</option>
<replaceable>ARG</replaceable></term>
<listitem>
<!--
<para>Used to make <command>svn mergeinfo</command>
- display either <literal>merged</literal>
- or <literal>eligible</literal> revisions.</para>
+ display certain classes of merge tracking
+ information. <replaceable>ARG</replaceable> may be
+ either <literal>merged</literal>
+ or <literal>eligible</literal>, indicating a desire to
+ see revisions either already merged or eligible for future
+ merge from the specified source URL, respectively.</para>
-->
<para>Verwendet, um <command>svn mergeinfo</command>
- mitzuteilen, dass <literal>merged</literal>
- (zusammengeführte) oder <literal>eligible</literal> (in
- Frage kommende) Revisionen angezeigt werden
- sollen.</para>
+ bestimmte Klassen von Informationen zur
+ Zusammenführungs-Verfolgung anzeigen zu lassen.
+ <replaceable>ARG</replaceable> kann entweder
+ <literal>merged</literal> oder
+ <literal>eligible</literal> sein, je nach dem Wunsch,
+ bereits zusammengeführte bzw. für künftige
+ Zusammenführungen in Frage kommende Revisionen des
+ angegebenen Quell-URLs zu sehen.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.show_updates">
<term><option>--show-updates</option>
(<option>-u</option>)</term>
<listitem>
<!--
@@ -1517,7 +1545,7 @@
which files in your working copy are out of date.
This doesn't actually update any of your
files—it just shows you which files will be
- updated if you then use <command>svn update</command>.
+ updated if you then use <command>svn update</command>.</para>
-->
<para>Teilt dem Client mit, Informationen über die Dateien
anzuzeigen, die in Ihrer Arbeitskopie nicht mehr dem
@@ -1528,8 +1556,8 @@
</para>
</listitem>
</varlistentry>
-
- <varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.stop_on_copy">
<term><option>--stop-on-copy</option></term>
<listitem>
<!--
@@ -1548,8 +1576,8 @@
– angetroffen wird.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.strict">
<term><option>--strict</option></term>
<listitem>
<!--
@@ -1574,7 +1602,7 @@
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry id="svn.ref.svn.sw.summarize">
<term><option>--summarize</option></term>
<listitem>
<!--
@@ -1586,10 +1614,9 @@
anzeigen.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term><option>--targets</option>
- <replaceable>FILENAME</replaceable></term>
+
+ <varlistentry id="svn.ref.svn.sw.targets">
+ <term><option>--targets</option>
<replaceable>FILENAME</replaceable></term>
<listitem>
<!--
<para>Tells Subversion to read additional target paths for
@@ -1609,10 +1636,9 @@
wäre.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term><option>--use-merge-history</option>
- (<option>-g</option>)</term>
+
+ <varlistentry id="svn.ref.svn.sw.use_merge_history">
+ <term><option>--use-merge-history</option>
(<option>-g</option>)</term>
<listitem>
<!--
<para>Uses or displays additional information from merge
@@ -1622,8 +1648,8 @@
Zusammenführungen wird verwendet oder angezeigt.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.verbose">
<term><option>--verbose</option> (<option>-v</option>)</term>
<listitem>
<!--
@@ -1641,8 +1667,8 @@
ausgibt.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.version">
<term><option>--version</option></term>
<listitem>
<!--
@@ -1662,8 +1688,8 @@
Kurzform ausgegeben.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.with_all_revprops">
<term><option>--with-all-revprops</option></term>
<listitem>
<!--
@@ -1682,7 +1708,7 @@
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry id="svn.ref.svn.sw.with_no_revprops">
<term><option>--with-no-revprops</option></term>
<listitem>
<!--
@@ -1701,9 +1727,8 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term><option>--with-revprop</option>
- <replaceable>ARG</replaceable></term>
+ <varlistentry id="svn.ref.svn.sw.with_revprop">
+ <term><option>--with-revprop</option>
<replaceable>ARG</replaceable></term>
<listitem>
<!--
<para>When used with any command that writes to the
@@ -1727,7 +1752,7 @@
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry id="svn.ref.svn.sw.xml">
<term><option>--xml</option></term>
<listitem>
<!--
@@ -7382,6 +7407,248 @@
weiterführende Informationen zu Hook-Skripten.</para>
</note>
+ </refsect1>
+ </refentry>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
+ <refentry id="svn.ref.svn.c.relocate">
+
+ <indexterm>
+ <primary>svn</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>relocate</tertiary>
+ </indexterm>
+
+ <refnamediv>
+ <refname>svn relocate</refname>
+ <refpurpose>Relocate the working copy to point to a
+ different repository root URL.</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Synopsis</title>
+ <para><literal>svn relocate FROM-PREFIX TO-PREFIX
[PATH...]</literal></para>
+ <para><literal>svn relocate TO-URL [PATH]</literal></para>
+ </refsect1>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para>Sometimes an administrator might change the location
+ (or apparent location, from the client's perspective) of a
+ repository. The content of the repository doesn't change,
+ but the repository's root URL does. The hostname may
+ change because the repository is now being served from a
+ different computer. Or, perhaps the URL scheme changes
+ because the repository is now being served via SSL
+ (using <literal>https://</literal>) instead of over plain
+ HTTP. There are many different reasons for these types of
+ repository relocations. But ideally, a <quote>change of
+ address</quote> for a repository shouldn't suddently cause
+ all the working copies which point to that repository to
+ become forever unusable. And fortunately, that's not the
+ case. Rather than force users to check out a new working
+ copy when a repository is relocated, Subversion provides
+ the <command>svn relocate</command> command, which
+ <quote>rewrites</quote> the working copy's administrative
+ metadata to refer to the new repository location.</para>
+
+ <para>The first <command>svn relocate</command> syntax
+ allows you to update one or more working copies by what
+ essentially amounts to a find-and-replace within the
+ repository root URLs recorded in those working copies.
+ Subversion will replace the initial substring
+ <replaceable>FROM-PREFIX</replaceable> with the
+ string <replaceable>TO-PREFIX</replaceable> in those URLs.
+ These initial URL substrings can be as long or as short as
+ is necessary to differentiate between them. Obviously, to
+ use this syntax form, you need to know both the current
+ root URL of the repository to which the working copy is
+ pointing, and the new URL of that repository.
+ (You can use <command>svn info</command> to determine
+ the former.)</para>
+
+ <para>The second syntax does not require that you know the
+ current repository root URL with which the working copy is
+ associated at all—only the new repository URL
+ (<replaceable>TO-URL</replaceable>) to which it should be
+ pointing. In this syntax form, only one working copy may
+ be relocated at a time.</para>
+
+ <warning>
+ <para>Users often get confused about the difference
+ between <command>svn switch</command> and <command>svn
+ relocate</command>. Here's the rule of thumb:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>If the working copy needs to reflect a new
+ directory <emphasis>within</emphasis> the
+ repository, use <command>svn
+ switch</command>.</para>
+ </listitem>
+ <listitem>
+ <para>If the working copy still reflects the
+ same repository directory, but the location of the
+ repository itself has changed, use <command>svn
+ relocate</command>.</para>
+ </listitem>
+ </itemizedlist>
+ </warning>
+
+ </refsect1>
+
+ <refsect1>
+ <title>Options</title>
+
+ <informalexample>
+ <screen>
+<xref linkend="svn.ref.svn.sw.ignore_externals" />
+</screen>
+ </informalexample>
+ </refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+
+ <para>Let's start with a working copy that reflects a local
+ repository URL:</para>
+
+ <informalexample>
+ <screen>
+$ svn info | grep URL:
+URL: file:///var/svn/repos/trunk
+$
+</screen>
+ </informalexample>
+
+ <para>One day the administrator decides to rename the
+ on-disk repository directory. We missed the memo, so we
+ see an error the next time we try to update our working
+ copy.</para>
+
+ <informalexample>
+ <screen>
+$ svn up
+Updating '.':
+svn: E180001: Unable to connect to a repository at
URL 'file:///var/svn/repos/trunk'
+</screen>
+ </informalexample>
+
+ <para>After cornering the administrator over by the vending
+ machines, we learn about the repository being moved and
+ are told the new URL. Rather than checkout a new working
+ copy, though, we simply ask Subversion to rewrite the
+ working copy metadata to point to the new repository
+ location.</para>
+
+ <informalexample>
+ <screen>
+$ svn relocate file:///var/svn/new-repos/trunk
+$
+</screen>
+ </informalexample>
+
+ <para>Subversion doesn't tell us much about what it did, but
+ hey—error-free operation is really all we need,
+ right? Our working copy is functional for online
+ operations again.</para>
+
+ <informalexample>
+ <screen>
+$ svn up
+Updating '.':
+A lib/new.c
+M src/code.h
+M src/headers.h
+…
+</screen>
+ </informalexample>
+
+ <note>
+ <para>Once again, this type of relocation
+ affects <emphasis>working copy metadata only</emphasis>.
+ It will not change your versioned or unversioned file
+ contents, perform any version control operations (such
+ as commits or updates), and so on.</para>
+ </note>
+
+ <para>A few months later, we're told that the company is
+ moving development to separate machines and that we'll be
+ using HTTP to access the repository. So we relocate our
+ working copy again.</para>
+
+ <informalexample>
+ <screen>
+$ svn relocate http://svn.company.com/repos/trunk
+$
+</screen>
+ </informalexample>
+
+ <para>Now, each time we perform a relocation of this sort,
+ Subversion contacts the repository—at its new URL,
+ of course—to verify a few things.</para>
+
+ <para>First, it wants to compare the UUID of the repository
+ against what is stored in the working copy. If these UUIDs
+ don't match, the working copy relocation is disallowed.
+ Maybe this isn't the same repository (just in a new
+ location) after all?</para>
+
+ <para>Secondly, Subversion wants to ensure that the updated
+ working copy metadata jives with respect to the directory
+ location <emphasis>inside</emphasis> the repository.
+ Subversion won't let you accidentally relocate a working
+ copy of a branch in your repository to the URL of a
+ different branch in the same repository. (That's
+ what <command>svn switch</command>, described in
+ <xref linkend="svn.ref.svn.c.switch" />, is for.)</para>
+
+ <para>Also, Subversion will not allow you to relocate a
+ subtree of the working copy. If you're going to relocate
+ the working copy at all, you must relocate the whole
+ thing. This is to protect the integrity of the working
+ copy metadata and behavior as a whole. (And really, you'd
+ be hard pressed to come up with a compelling reason to
+ relocate only a piece of your working copy anyway.)</para>
+
+ <para>Let's look at one final relocation opportunity. After
+ using HTTP access for some time, the company moves to
+ SSL-only access. Now, the only change to the repository
+ URL is that the scheme goes from
+ being <literal>http://</literal> to
+ being <literal>https://</literal>. There are two
+ different ways that we could make our working copy reflect
+ ths change. The first is to do exactly as we've done
+ before and relocate to the new repository URL.</para>
+
+ <informalexample>
+ <screen>
+$ svn relocate http://svn.company.com/repos/trunk
+$
+</screen>
+ </informalexample>
+
+ <para>But we have another option here, too. We could simply
+ ask Subversion to swap out the changed prefixes of the
+ URL.</para>
+
+ <informalexample>
+ <screen>
+$ svn relocate http https
+$
+</screen>
+ </informalexample>
+
+ <para>Either approach leaves us a working copy whose
+ metadata has been updated to point to the right repository
+ location.</para>
+
+ <para>By default, <command>svn relocate</command> will
+ traverse any external working copies nested within your
+ working copy and attempt relocation of those working
+ copies, too. Use the <option>--ignore-externals</option>
+ option to disable this behavior.</para>
+
</refsect1>
</refentry>
More information about the svnbook-dev
mailing list