[svnbook] r4524 committed - Translation: Resurrecting Deleted Items

[svnbook at googlecode.com]

Revision: 4524
Author:   jmfelderhoff at gmx.eu
Date:     Thu Jul  4 13:11:25 2013
Log:      Translation: Resurrecting Deleted Items

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

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

=======================================
--- /branches/1.6/de/book/ch04-branching-and-merging.xml	Thu Jul  4  
12:37:33 2013
+++ /branches/1.6/de/book/ch04-branching-and-merging.xml	Thu Jul  4  
13:11:25 2013
@@ -2401,7 +2401,8 @@
          eine inkrementelle Suche in einem Editor).</para>

  <!--
-      <screen>
+      <informalexample>
+        <screen>
  $ cd parent-dir
  $ svn log -v
  …
@@ -2415,8 +2416,10 @@
  Removed real.c because code now in double.c.
  …
  </screen>
+      </informalexample>
  -->
-      <screen>
+      <informalexample>
+        <screen>
  $ cd parent-dir
  $ svn log -v
  …
@@ -2430,6 +2433,7 @@
  real.c gelöscht, da Code jetzt in double.c.
  …
  </screen>
+      </informalexample>

  <!--
        <para>In the example, we're assuming that you're looking for a
@@ -2521,29 +2525,33 @@
          Projektarchiv in Ihre Arbeitskopie:</para>

  <!--
-      <screen>
-$ svn copy http://svn.example.com/repos/calc/trunk/real.c@807 ./real.c
+      <informalexample>
+        <screen>
+$ svn copy ^/calc/trunk/real.c at 807 ./real.c

  $ svn status
-A  +   real.c
+A  +    real.c

  $ svn commit -m "Resurrected real.c from revision 807, /calc/trunk/real.c."
  Adding         real.c
  Transmitting file data .
  Committed revision 1390.
  </screen>
+      </informalexample>
  -->
-      <screen>
+      <informalexample>
+        <screen>
  $ svn copy http://svn.example.com/repos/calc/trunk/real.c@807 ./real.c

  $ svn status
-A  +   real.c
+A  +    real.c

  $ svn commit -m "real.c aus revision 807 wiederhergestellt,  
/calc/trunk/real.c."
  Hinzufügen     real.c
  Übertrage Daten .
  Revision 1390 übertragen.
  </screen>
+      </informalexample>

  <!--
        <para>The plus sign in the status output indicates that the item
@@ -2575,8 +2583,24 @@
          Datei zurückholen wollen, funktioniert diese Technik
          ebensogut:</para>

-      <screen>
-$ svn cat http://svn.example.com/repos/calc/trunk/real.c@807 > ./real.c
+<!--
+      <informalexample>
+        <screen>
+$ svn cat ^/calc/trunk/real.c at 807 > ./real.c
+
+$ svn add real.c
+A         real.c
+
+$ svn commit -m "Re-created real.c from revision 807."
+Adding         real.c
+Transmitting file data .
+Committed revision 1390.
+</screen>
+      </informalexample>
+-->
+      <informalexample>
+        <screen>
+$ svn cat ^/calc/trunk/real.c at 807 > ./real.c

  $ svn add real.c
  A         real.c
@@ -2586,6 +2610,7 @@
  Übertrage Daten .
  Revision 1390 übertragen.
  </screen>
+      </informalexample>

  <!--
        <para>Although our example shows us resurrecting a file, note
@@ -2603,9 +2628,9 @@
          werden:</para>

  <!--
-      <screen>
-$ svn copy http://svn.example.com/repos/calc/trunk/real.c@807 \
-           http://svn.example.com/repos/calc/trunk/ \
+      <informalexample>
+        <screen>
+$ svn copy ^/calc/trunk/real.c at 807 ^/calc/trunk/ \
        -m "Resurrect real.c from revision 807."
  Committed revision 1390.

@@ -2613,10 +2638,11 @@
  A    real.c
  Updated to revision 1390.
  </screen>
+      </informalexample>
  -->
-      <screen>
-$ svn copy http://svn.example.com/repos/calc/trunk/real.c@807 \
-           http://svn.example.com/repos/calc/trunk/ \
+      <informalexample>
+        <screen>
+$ svn copy ^/calc/trunk/real.c at 807 ^/calc/trunk/ \
        -m "real.c aus Revision 807 wiederhergestellt."
  Revision 1390 übertragen.

@@ -2624,6 +2650,7 @@
  A    real.c
  Aktualisiert zu Revision 1390.
  </screen>
+      </informalexample>

      </sect2>