[svnbook] r4740 committed - intermediate commit

svnbook at googlecode.com svnbook at googlecode.com
Fri Mar 28 08:25:53 CDT 2014


Revision: 4740
Author:   jmfelderhoff at gmx.eu
Date:     Fri Mar 28 13:25:38 2014 UTC
Log:      intermediate commit
http://code.google.com/p/svnbook/source/detail?r=4740

Modified:
  /branches/1.7/de/book/ch09-reference.xml

=======================================
--- /branches/1.7/de/book/ch09-reference.xml	Wed Mar 19 17:56:05 2014 UTC
+++ /branches/1.7/de/book/ch09-reference.xml	Fri Mar 28 13:25:38 2014 UTC
@@ -6011,21 +6011,42 @@
                    verlangten Revisionen zusammengeführt
                    werden).</para>
                </tip>
+<!--
                <para>In both variants of the first form,
                  <replaceable>SOURCE</replaceable> in revision
                  <replaceable>REV</replaceable> is compared as it existed
                  between revisions <replaceable>N</replaceable> and
                  <replaceable>M</replaceable> for each revision range
                  provided.</para>
+-->
+              <para>In beiden Varianten der ersten Form wird
+                <replaceable>SOURCE</replaceable> in Revision
+                <replaceable>REV</replaceable> verglichen, wie sie
+                zwischen den Revisionen <replaceable>N</replaceable>
+                und <replaceable>M</replaceable> für jeden angegebenen
+                Revisionsbereich existiert hat.</para>
              </listitem>
              <listitem>
+<!--
                <para>Reintegrate Merges</para>
+-->
+              <para>Zusammenführung zur Reintegration</para>
+<!--
                <para>The second form is called a <quote>reintegrate
                  merge</quote> and is used to bring changes from a feature
                  branch (<replaceable>SOURCE</replaceable>)
                  back into the feature branch's immediate ancestor branch
                  (<replaceable>TARGET_WCPATH</replaceable>).</para>
+-->
+              <para>Die zweite Form wird
+                <quote>Reintegrations-Zusammenführung</quote> genannt
+                und wird verwendet, um änderungen von einem Zweig
+                (<replaceable>SOURCE</replaceable>) zurück auf den
+                unmittelbaren Vorgänger-Zweig
+                (<replaceable>TARGET_WCPATH</replaceable>) zu
+                bringen.</para>
                <tip>
+<!--
                  <para>Reintegrate merges support only this specialized
                    use case and as such have a number of special
                    requirements and limitations that the other two merge
@@ -6034,12 +6055,28 @@
                    <xref  
linkend="svn.branchemerge.basicmerging.reintegrate"/>,
                    <xref  
linkend="svn.branchmerge.advanced.reintegratetwice"/>,
                    and
+                  <xref linkend="svn.branchmerge.commonpatterns.feature"/>.
+                </para>
+-->
+                <para>Zusammenführungen zur Reintegration unterstützen
+                  nur diesen speziellen Anwendungsfall und besitzen
+                  deshalb eine Reihe besonderer Anforderungen und
+                  Einschränkungen, die die anderen beiden Formen der
+                  Zusammenführung nicht haben. Siehe
+                  <xref  
linkend="svn.branchemerge.basicmerging.stayinsync"/>,
+                  <xref  
linkend="svn.branchemerge.basicmerging.reintegrate"/>,
+                  <xref  
linkend="svn.branchmerge.advanced.reintegratetwice"/>,
+                  und
                    <xref linkend="svn.branchmerge.commonpatterns.feature"/>.
                  </para>
                </tip>
              </listitem>
              <listitem>
+<!--
                <para>2-URL Merges</para>
+-->
+              <para>2-URL-Zusammenführungen</para>
+<!--
                <para>In the third form, called a <quote>2-URL Merge</quote>,
                  the difference between <replaceable>SOURCE1</replaceable>
                  at revision <replaceable>N</replaceable> and
@@ -6047,17 +6084,30 @@
                  <replaceable>M</replaceable> is generated and applied to
                  <replaceable>TARGET_WCPATH</replaceable>.  The revisions
                  default to <literal>HEAD</literal> if omitted.</para>
+-->
+              <para>In der dritten Form,
+                <quote>2-URL-Zusammenführung</quote> genannt,
+                wird der Unterschied zwischen
+                <replaceable>SOURCE1</replaceable> in Revision
+                <replaceable>N</replaceable> und
+                <replaceable>SOURCE2</replaceable> in Revision
+                <replaceable>M</replaceable> erstellt und auf
+                <replaceable>TARGET_WCPATH</replaceable> angewendet.
+                Die Revisionen sind standardmäßig
+                <literal>HEAD</literal>, falls sie nicht angegeben
+                sind.</para>
              </listitem>
            </itemizedlist>

-
-
  <!--
-          <para>Subversion will internally track metadata about
-            the merge operation only if the two sources are ancestrally
+          <para>If
+            <xref linkend="svn.branchmerge.basicmerging.mergetracking"/>
+            is active, then Subversion will internally track metadata
+            (i.e. the <literal>svn:mergeinfo</literal> property) about
+            merge operations when the two merge sources are ancestrally
              related—if the first source is an ancestor of the
-            second or vice versa.  This is guaranteed to be the case
-            when using the third form.  Unlike <command>svn
+            second or vice versa—this is guaranteed to be the case
+            when using the first two forms.  Unlike <command>svn
              diff</command>, the merge command takes the ancestry of a
              file into consideration when performing a merge operation.
              This is very important when you're merging changes from


More information about the svnbook-dev mailing list