[svnbook] r4775 committed - Translation: General Vendor Branch Management Procedure

svnbook at googlecode.com svnbook at googlecode.com
Tue May 6 00:15:47 CDT 2014


Revision: 4775
Author:   jmfelderhoff at gmx.eu
Date:     Tue May  6 05:15:34 2014 UTC
Log:      Translation: General Vendor Branch Management Procedure

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

Modified:
  /branches/1.7/de/book/ch04-branching-and-merging.xml

=======================================
--- /branches/1.7/de/book/ch04-branching-and-merging.xml	Tue May  6  
05:05:15 2014 UTC
+++ /branches/1.7/de/book/ch04-branching-and-merging.xml	Tue May  6  
05:15:34 2014 UTC
@@ -7472,20 +7472,13 @@
          liegenden Elternverzeichnisse erzeugt, können wir all diese
          Schritte mit einem einzigen Befehl bewerkstelligen:</para>

-<!--
        <informalexample>
          <screen>
  $ svn import /path/to/libcomplex-1.0 \
               http://svn.example.com/repos/vendor/libcomplex/current \
+<!--
               -m "importing initial 1.0 vendor drop"
-…
-</screen>
-      </informalexample>
  -->
-      <informalexample>
-        <screen>
-$ svn import /path/to/libcomplex-1.0 \
-             http://svn.example.com/repos/vendor/libcomplex/current \
               -m "Importing der ersten 1.0 Zulieferung"
  …
  </screen>
@@ -7512,28 +7505,20 @@
          kopierten Version der Lieferantendaten werden wir unsere
          Anpassungen vornehmen:</para>

-<!--
        <informalexample>
          <screen>
  $ svn copy http://svn.example.com/repos/vendor/libcomplex/current  \
             http://svn.example.com/repos/vendor/libcomplex/1.0      \
+<!--
             -m "tagging libcomplex-1.0"
-…
-$ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0  \
-           http://svn.example.com/repos/calc/libcomplex        \
-           -m "bringing libcomplex-1.0 into the main branch"
-…
-</screen>
-      </informalexample>
  -->
-      <informalexample>
-        <screen>
-$ svn copy http://svn.example.com/repos/vendor/libcomplex/current  \
-           http://svn.example.com/repos/vendor/libcomplex/1.0      \
             -m "Tag libcomplex-1.0"
  …
  $ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0  \
             http://svn.example.com/repos/calc/libcomplex        \
+<!--
+           -m "bringing libcomplex-1.0 into the main branch"
+-->
             -m "libcomplex-1.0 in den Huptzweig bringen"
  …
  </screen>
@@ -7659,27 +7644,18 @@
          und der neuen aktuellen Version in unseren
          Hauptentwicklungszweig ein:</para>

-<!--
        <informalexample>
          <screen>
  $ cd working-copies/calc
  $ svn merge ^/vendor/libcomplex/1.0      \
              ^/vendor/libcomplex/current  \
              libcomplex
+<!--
  … # resolve all the conflicts between their changes and our changes
  $ svn commit -m "merging libcomplex-1.1 into the main branch"
-…
-</screen>
-      </informalexample>
  -->
-      <informalexample>
-        <screen>
-$ cd working-copies/calc
-$ svn merge ^/vendor/libcomplex/1.0      \
-            ^/vendor/libcomplex/current  \
-            libcomplex
  … # alle Konflikte zwischen ihren und unseren Änderungen auflösen
-$ svn commit -m "merging libcomplex-1.1 into the main branch"
+$ svn commit -m "libcomplex-1.1 mit dem Hauptzweig zusammenführen"
  …
  </screen>
        </informalexample>


More information about the svnbook-dev mailing list