[svnbook] r4510 committed - Traslation: Discarding your changes in favor of a newly fetched revisi...

svnbook at googlecode.com svnbook at googlecode.com
Tue Jun 11 16:21:20 CDT 2013


Revision: 4510
Author:   jmfelderhoff at gmx.eu
Date:     Tue Jun 11 14:20:58 2013
Log:      Traslation: Discarding your changes in favor of a newly fetched  
revision

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

Modified:
  /branches/1.6/de/book/ch02-basic-usage.xml

=======================================
--- /branches/1.6/de/book/ch02-basic-usage.xml	Tue Jun 11 13:59:48 2013
+++ /branches/1.6/de/book/ch02-basic-usage.xml	Tue Jun 11 14:20:58 2013
@@ -3803,16 +3803,29 @@
        <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  
-->
        <sect3 id="svn.tour.cycle.resolve.theirsfull">
  <!--
-        <title>Discarding your changes in favor of a newly fetched  
revision</title>
+        <title>Discarding your changes in favor of a newly fetched
+          revision</title>
  -->
          <title>Verwerfen Ihrer Änderungen zugunsten einer aktualisierten  
Revision aus dem Projektarchiv</title>

  <!--
+        <indexterm>
+          <primary>conflicts</primary>
+          <secondary>resolution</secondary>
+        </indexterm>
+
          <para>If you get a conflict and decide that you want to throw
-          out your changes, you can run <userinput>svn resolve - -accept
-          theirs-full  
<replaceable>CONFLICTED-PATH</replaceable></userinput> and Subversion will  
discard your edits
-          and remove the temporary files:</para>
+          out your changes, you can run <userinput>svn resolve
+          - -accept theirs-full
+          <replaceable>CONFLICTED-PATH</replaceable></userinput> and
+          Subversion will discard your edits and remove the temporary
+          files:</para>
  -->
+        <indexterm>
+          <primary>Konflikte</primary>
+          <secondary>Auflösung</secondary>
+        </indexterm>
+
          <para>Falls Sie einen Konflikt erhalten und entscheiden, dass
            Sie Ihre Änderungen verwerfen wollen, können Sie
            <userinput>svn resolve --accept theirs-full
@@ -3821,31 +3834,41 @@
            die temporären Dateien entfernen:</para>

  <!--
-       <screen>
+        <informalexample>
+         <screen>
  $ svn update
  Conflict discovered in 'sandwich.txt'.
  Select: (p) postpone, (df) diff-full, (e) edit,
-        (h) help for more options: p
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
  C    sandwich.txt
  Updated to revision 2.
+Summary of conflicts:
+  Text conflicts: 1
  $ ls sandwich.*
  sandwich.txt  sandwich.txt.mine  sandwich.txt.r2  sandwich.txt.r1
  $ svn resolve - -accept theirs-full sandwich.txt
  Resolved conflicted state of 'sandwich.txt'
+$
  </screen>
+       </informalexample>
  -->
-       <screen>
+        <informalexample>
+         <screen>
  $ svn update
  Konflikt in »sandwich.txt« entdeckt.
  Auswahl: (p) zurückstellen, (df) voller Diff, (e) editieren,
-        (h) Hilfe für weitere Optionen: p
+         (mc) eigene konfliktbehaftete Datei, (tc) fremde  
konfliktbehaftete Datei
+         (s) alle Optionen anzeigen: p
  C    sandwich.txt
  Aktualisiert zu Revision 2.
  $ ls sandwich.*
  sandwich.txt  sandwich.txt.mine  sandwich.txt.r2  sandwich.txt.r1
  $ svn resolve --accept theirs-full sandwich.txt
  Konflikt von »sandwich.txt« aufgelöst
+$
  </screen>
+       </informalexample>

        </sect3>



More information about the svnbook-dev mailing list