[svnbook] r4765 committed - Translation: Merges and Moves
svnbook at googlecode.com
svnbook at googlecode.com
Thu May 1 16:36:54 CDT 2014
Revision: 4765
Author: jmfelderhoff at gmx.eu
Date: Thu May 1 21:36:48 2014 UTC
Log: Translation: Merges and Moves
http://code.google.com/p/svnbook/source/detail?r=4765
Modified:
/branches/1.7/de/book/ch04-branching-and-merging.xml
=======================================
--- /branches/1.7/de/book/ch04-branching-and-merging.xml Thu May 1
21:31:26 2014 UTC
+++ /branches/1.7/de/book/ch04-branching-and-merging.xml Thu May 1
21:36:48 2014 UTC
@@ -5462,28 +5462,23 @@
übergeben. Nun entscheiden Sie sich, Ihren Zweig mit dem Stamm
zusammenzuführen:</para>
-<!--
<informalexample>
<screen>
$ cd calc/trunk
-$ svn merge - -reintegrate
http://svn.example.com/repos/calc/branches/my-calc-branch
+$ svn merge --reintegrate ^/calc/branches/my-calc-branch
+<!--
- - - Merging differences between repository URLs into '.':
-D integer.c
-A whole.c
-U .
-</screen>
- </informalexample>
-->
- <informalexample>
- <screen>
-$ cd calc/trunk
-
-$ svn merge --reintegrate
http://svn.example.com/repos/calc/branches/my-calc-branch
-- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in ».«:
-D integer.c
-A whole.c
-U .
+D integer.c
+A whole.c
+U .
+<!--
+- - - Recording mergeinfo for merge between repository URLs into '.':
+-->
+-- Aufzeichnung der Informationen für Zusammenführung zwischen
Projektarchiv-URLs in ».«:
+ U .
</screen>
</informalexample>
More information about the svnbook-dev
mailing list