[svnbook] r4536 committed - Translation: Merge-Sensitive Logs and Annotations

[svnbook at googlecode.com]

Revision: 4536
Author:   jmfelderhoff at gmx.eu
Date:     Sat Aug 17 21:37:54 2013 UTC
Log:      Translation: Merge-Sensitive Logs and Annotations

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

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

=======================================
--- /branches/1.6/de/book/ch04-branching-and-merging.xml	Tue Aug  6  
16:41:51 2013 UTC
+++ /branches/1.6/de/book/ch04-branching-and-merging.xml	Sat Aug 17  
21:37:54 2013 UTC
@@ -4056,7 +4056,8 @@
          den Zweig hineingeflossen ist:</para>

  <!--
-      <screen>
+      <informalexample>
+        <screen>
  $ cd my-calc-branch
  $ svn log -q
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -4079,8 +4080,10 @@
  r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  </screen>
+      </informalexample>
  -->
-      <screen>
+      <informalexample>
+        <screen>
  $ cd my-calc-branch
  $ svn log -q
  ------------------------------------------------------------------------
@@ -4103,6 +4106,7 @@
  r98 | sally | 2002-02-22 15:35:29 -0600 (Fr, 22. Feb 2002) | 2 lines
  ------------------------------------------------------------------------
  </screen>
+      </informalexample>

  <!--
        <para>But is this really an accurate picture of all the changes
@@ -4122,7 +4126,8 @@
          ausmachen, nirgendwo sehen:</para>

  <!--
-      <screen>
+      <informalexample>
+        <screen>
  $ svn log -v -r 390
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
@@ -4132,8 +4137,10 @@

  Final merge of trunk changes to my-calc-branch.
  </screen>
+      </informalexample>
  -->
-      <screen>
+      <informalexample>
+        <screen>
  $ svn log -v -r 390
  ------------------------------------------------------------------------
  r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
@@ -4143,6 +4150,7 @@

  Letzte Zusammenführung der Änderungen von trunk changes in my-calc-branch.
  </screen>
+      </informalexample>

  <!--
        <para>We happen to know that this merge to the branch was
@@ -4161,7 +4169,8 @@
          Zusammenführung bestand.</para>

  <!--
-     <screen>
+      <informalexample>
+        <screen>
  $ svn log -v -r 390 -g
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
@@ -4185,6 +4194,7 @@

  Document my last fix in README.
  </screen>
+      </informalexample>
  -->
       <screen>
  $ svn log -v -r 390 -g
@@ -4242,7 +4252,8 @@
          ausgehen, dass Sie für die Zeilen verantwortlich sind, die
          einen bestimmten Fehler beseitigt haben:</para>

-      <screen>
+      <informalexample>
+        <screen>
  $ svn blame button.c
  …
     390    user    retval = inverse_func(button, path);
@@ -4250,6 +4261,7 @@
     390    user    }
  …
  </screen>
+      </informalexample>

  <!--
        <para>And while it's true that you did actually commit those
@@ -4260,7 +4272,8 @@
          390 übergeben haben, sind zwei davon tatsächlich von Sally in
          Revision 383 geschrieben worden:</para>

-      <screen>
+      <informalexample>
+        <screen>
  $ svn blame button.c -g
  …
  G    383    sally   retval = inverse_func(button, path);
@@ -4268,6 +4281,7 @@
       390    user    }
  …
  </screen>
+      </informalexample>

  <!--
        <para>Now we know who to <emphasis>really</emphasis> blame for
@@ -4278,7 +4292,7 @@

      </sect2>

-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- ===============================================================  
-->
      <sect2 id="svn.branchmerge.advanced.ancestry">
  <!--
        <title>Noticing or Ignoring Ancestry</title>