[svnbook commit] r3103 - trunk/src/en/book

fitz noreply at red-bean.com
Wed Jun 4 01:54:42 CDT 2008


Author: fitz
Date: Wed Jun  4 01:54:42 2008
New Revision: 3103

Log:
Undo accidental commit when I attempted to complete an example from the wrong shell.  How meta of me.

Modified:
   trunk/src/en/book/ch02-basic-usage.xml

Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml	(original)
+++ trunk/src/en/book/ch02-basic-usage.xml	Wed Jun  4 01:54:42 2008
@@ -436,7 +436,7 @@
             <para><command>svn update</command></para>
           </listitem>
           <listitem>
-            <para><command>svn resolve</command></para>
+            <para><command>svn resolved</command></para>
           </listitem>
         </itemizedlist>
       </listitem>
@@ -1403,40 +1403,42 @@
 svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in conflict
 </screen>
 
-        <para>If you've postponed a conflict, you need to resolve the
-          conflict before Subversion will allow you to commit your
-          changes.  You'll do this with the <command>svn
-          resolve</command> command and one of several arguments to
-          the <option>--accept</option> option.</para>
-
-        <para>If you want to choose the version of the file that you
-          last checked out before making your edits, choose
-          the <replaceable>base</replaceable> argument.</para>
-
-        <para>If you want to choose the version that contains only
-          your edits, choose the <replaceable>mine-full</replaceable>
-          argument.</para>
-
-        <para>If you want to choose the version that your most recent
-          update pulled from the server (and thus discarding your
-          edits entirely), choose
-          the <replaceable>theirs-full</replaceable> argument.</para>
-
-        <para>However, if you want to pick and choose from your
-          changes and the changes that your update fetched from the
-          server, merge the conflicted text <quote>by hand</quote> (by
-          examining and editing the conflict markers within the file)
-          and then choose the <replaceable>working</replaceable>
-          argument.</para>
-
-        <para><command>svn resolve</command> removes the three
-          temporary files, accepts the version of the file that you
-          specified with the <option>--accept</option> option, and
-          Subversion no longer considers the file to be in a state of
-          conflict.</para>
+        <para>If you've postponed a conflict, you need to do one of three
+          things:</para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>Merge the conflicted text <quote>by hand</quote> (by
+                examining and editing the conflict markers within the
+                file).</para>
+            </listitem>
+
+            <listitem>
+              <para>Copy one of the temporary files on top of your
+                working file.</para>
+            </listitem>
+
+            <listitem>
+              <para>Run <command>svn revert <FILENAME></command>
+                to throw away all of your local changes.</para>
+            </listitem>
+
+          </itemizedlist>
+
+        <para>Once you've resolved the conflict, you need to let
+          Subversion know by running <command>svn resolved</command>.
+          This removes the three temporary files, and Subversion no
+          longer considers the file to be in a state of conflict.
+          <footnote>
+            <para>You can always remove the temporary files yourself,
+              but would you really want to do that when Subversion can
+              do it for you?  We didn't think so.</para>
+          </footnote>
+        </para>
 
         <screen>
-$ svn resolve --accept working sandwich.txt
+$ svn resolved sandwich.txt
 Resolved conflicted state of 'sandwich.txt'
 </screen>
 
@@ -1529,20 +1531,18 @@
 Bottom piece of bread
 </screen>
 
-        <para>Now run <command>svn resolve</command>, and you're
+        <para>Now run <command>svn resolved</command>, and you're
           ready to commit your changes:</para>
 
         <screen>
-$ svn resolve --accept working sandwich.txt
-Resolved conflicted state of 'sandwich.txt'
+$ svn resolved sandwich.txt
 $ svn commit -m "Go ahead and use my sandwich, discarding Sally's edits."
 </screen>
 
-        <para>Note that <command>svn resolve</command>, unlike most of
-          the other commands we deal with in this chapter, requires
-          that you explicitly list any filenames that you wish to
-          resolve.  In any case, you want to be careful and run
-          <command>svn resolve</command> only when you're certain that
+        <para>Note that <command>svn resolved</command>, unlike most
+          of the other commands we deal with in this chapter, requires
+          an argument.  In any case, you want to be careful and run
+          <command>svn resolved</command> only when you're certain that
           you've fixed the conflict in your file—once the
           temporary files are removed, Subversion will let you commit
           the file even if it still contains conflict markers.</para>
@@ -1561,9 +1561,9 @@
         <title>Copying a file onto your working file</title>
 
         <para>If you get a conflict and decide that you want to throw
-          out your changes, you can merely run <command>svn
-          resolve --accept theirs-full</command> and Subversion will
-          take care of everything for you:</para>
+          out your changes, you can merely copy one of the temporary
+          files created by Subversion over the file in your working
+          copy:</para>
 
         <screen>
 $ svn update




More information about the svnbook-dev mailing list