[svnbook] r3566 commited - * trunk/src/de/book/ch09-reference.xml...

[codesite-noreply at google.com]

Revision: 3566
Author: jmfelderhoff at gmx.eu
Date: Sun Jul 26 06:52:54 2009
Log: * trunk/src/de/book/ch09-reference.xml
   - Ticket #262 command "svn mergeinfo" (cf.
     http://www.svnbook.de/report/6).
   - Edited examples of patch r3565 by cmpilato for version 1.5 where
     carets were not yet available for specifying URLs.

http://code.google.com/p/svnbook/source/detail?r=3566

Modified:
  /trunk/src/de/book/ch09-reference.xml

=======================================
--- /trunk/src/de/book/ch09-reference.xml	Thu Jul  9 06:36:32 2009
+++ /trunk/src/de/book/ch09-reference.xml	Sun Jul 26 06:52:54 2009
@@ -5674,9 +5674,14 @@

          <refnamediv>
            <refname>svn mergeinfo</refname>
+<!--
            <refpurpose>Query merge-related information.  See <xref
              linkend="svn.branchmerge.basicmerging.mergeinfo"/> for
              details.</refpurpose>
+-->
+          <refpurpose>Informationen bezüglich Zusammenführungen
+            abrufen. Für Details, siehe <xref
+             
linkend="svn.branchmerge.basicmerging.mergeinfo"/>.</refpurpose>
          </refnamediv>
          <refsect1>
  <!--
@@ -5691,16 +5696,31 @@
            <title>Description</title>
  -->
            <title>Beschreibung</title>
+<!--
            <para>Query information related to merges (or potential
              merges) between <replaceable>SOURCE-URL</replaceable> and
              <replaceable>TARGET</replaceable>.  If
-            the <option>--show-revs</option> option is not provided,
+            the <option>- -show-revs</option> option is not provided,
              display revisions which have been merged
              from <replaceable>SOURCE-URL</replaceable>
              to <replaceable>TARGET</replaceable>.  Otherwise, display
              either <literal>merged</literal>
              or <literal>eligible</literal> revisions as specified by
-            the <option>--show-revs</option> option.</para>
+            the <option>- -show-revs</option> option.</para>
+-->
+          <para>Abrufen von Informationen bezüglich Zusammenführungen
+            (oder potentiellen Zusammenführungen) zwischen
+            <replaceable>SOURCE-URL</replaceable> und
+            <replaceable>TARGET</replaceable>. Falls die Option
+            <option>--show-revs</option> nicht angegeben ist, werden
+            Revisionen angezeigt, die von
+            <replaceable>SOURCE-URL</replaceable> nach
+            <replaceable>TARGET</replaceable> zusammengeführt wurden.
+            Ansonsten werden entweder zusammengeführte
+            (<literal>merged</literal>) oder zum Zusammenführen in
+            Frage kommende (<literal>eligible</literal>) Revisionen
+            ausgegeben, je nachdem, was bei der Option
+            <option>--show-revs</option> angegeben wird.</para>

          </refsect1>
          <refsect1>
@@ -5708,7 +5728,10 @@
            <title>Alternate names</title>
  -->
            <title>Alternativnamen</title>
+<!--
            <para>None</para>
+-->
+          <para>Keine</para>
          </refsect1>

          <refsect1>
@@ -5716,7 +5739,10 @@
            <title>Changes</title>
  -->
            <title>Änderungen</title>
+<!--
            <para>Nothing</para>
+-->
+          <para>Nichts</para>
          </refsect1>

          <refsect1>
@@ -5724,7 +5750,10 @@
            <title>Accesses repository</title>
  -->
            <title>Repository-Zugriff</title>
+<!--
            <para>Yes</para>
+-->
+          <para>Ja</para>
          </refsect1>

          <refsect1>
@@ -5744,16 +5773,54 @@
  -->
            <title>Beispiele</title>

-          <para>Find out which changesets your trunk directory has
-            already received as well as what changesets it's still
-            eligible to receive:</para>
+<!--
+          <para>Find out which changesets your have been merged from
+            your trunk directory into your test branch:</para>
+-->
+          <para>Ermittelt, welche Änderungsmengen vom Stamm mit Ihrem
+            Testzweig zusammengeführt wurden:</para>

            <screen>
-$ svn mergeinfo branches/test
-Path: branches/test
-  Source path: /trunk
-    Merged ranges: r2:13
-    Eligible ranges: r13:15
+$ svn pget svn:mergeinfo http://svn.example.com/repos/calc/branches/test
+/branches/other:3-4
+/trunk:11-13,14,16
+$ svn mergeinfo --show-revs merged http://svn.example.com/repos/calc/trunk  
http://svn.example.com/repos/calc/branches/test
+r11
+r12
+r13
+r14
+r16
+$
+</screen>
+
+<!--
+          <para>Note that the default output from the <command>svn
+            mergeinfo</command> command is to display merged revisions, so
+            the <option>- -show-revs</option> option shown in the
+            command line of the previous example is not strictly
+            required.</para>
+-->
+          <para>Beachten Sie, dass der Befehl <command>svn
+            mergeinfo</command> standardmäßig zusammengeführte
+            Revisionen ausgibt, so dass die Option
+            <option>--show-revs</option> nicht unbedingt angegeben
+            werden muss.</para>
+
+<!--
+          <para>Find out which changesets from your trunk directory
+            have not yet been merged into your test branch:</para>
+-->
+          <para>Ermittelt, welche Änderungsmengen vom Stamm noch nicht
+            mit Ihrem Testzweig zusammengeführt wurden:</para>
+
+          <screen>
+$ svn mergeinfo --show-revs eligible  
http://svn.example.com/repos/calc/trunk  
http://svn.example.com/repos/calc/branches/test
+r15
+r17
+r20
+r21
+r22
+$
  </screen>

          </refsect1>