[svnbook] r4774 committed - Translation: Vendor Branches

[svnbook at googlecode.com]

Revision: 4774
Author:   jmfelderhoff at gmx.eu
Date:     Tue May  6 05:05:15 2014 UTC
Log:      Translation: Vendor Branches

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

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:03:21 2014 UTC
+++ /branches/1.7/de/book/ch04-branching-and-merging.xml	Tue May  6  
05:05:15 2014 UTC
@@ -7191,33 +7191,21 @@
          den Zweig mit der Option <option>--reintegrate</option> wieder
          mit dem Stamm zusammen:</para>

-<!--
        <informalexample>
          <screen>
  $ cd trunk-working-copy

  $ svn update
+Updating '.':
+<!--
  At revision 1910.
-
-$ svn merge - -reintegrate  
http://svn.example.com/repos/calc/branches/mybranch
-- - - Merging differences between repository URLs into '.':
-U    real.c
-U    integer.c
-A    newdirectory
-A    newdirectory/newfile
- U   .
-…
-</screen>
-      </informalexample>
  -->
-      <informalexample>
-        <screen>
-$ cd trunk-working-copy
-
-$ svn update
  Revision 1910.

-$ svn merge --reintegrate  
http://svn.example.com/repos/calc/branches/mybranch
+$ svn merge --reintegrate ^/calc/branches/mybranch
+<!--
+- - - Merging differences between repository URLs into '.':
+-->
  -- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in ».«:
  U    real.c
  U    integer.c
@@ -7319,7 +7307,7 @@
        repository, you could also use Subversion's externals
        definitions to effectively <quote>pin down</quote> specific
        versions of that information to some location in your own
-      working copy directory (see
+      working copy (see
        <xref linkend="svn.advanced.externals" />).</para>
  -->
      <para>Falls nun Ihr Projekt von den Informationen anderer