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

cmpilato noreply at red-bean.com
Mon Mar 31 22:59:51 CDT 2008


Author: cmpilato
Date: Mon Mar 31 22:59:51 2008
New Revision: 3023

Log:
* src/en/book/ch02-basic-usage.xml
  - updated output of interactive conflict resolution
* src/en/book/ch09-reference.xml
  - updated valid values for the accept option.

Patch by: Karl Heinz Marbaise <khmarbaise {at} gmx.de>

Modified:
   trunk/src/en/book/ch02-basic-usage.xml
   trunk/src/en/book/ch09-reference.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	Mon Mar 31 22:59:51 2008
@@ -1043,7 +1043,7 @@
 U  INSTALL
 G  README
 Conflict discovered in 'bar.c.
-Select: (p)ostpone, (d)iff, (e)dit, (h)elp for more options :
+Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: 
 </screen>
 
       <para>The <computeroutput>U</computeroutput> and
@@ -1067,14 +1067,14 @@
 
       <screen>
 ...
-  (p)ostpone - mark the conflict to be resolved later
-  (d)iff     - show all changes made to merged file
-  (e)dit     - change merged file in an editor
-  (r)esolved - accept merged version of file
-  (m)ine     - accept my version of file
-  (t)heirs   - accept their version of file
-  (l)aunch   - use third-party tool to resolve conflict
-  (h)elp     - show this list
+  (p)  postpone    - mark the conflict to be resolved later
+  (df) diff-full   - show all changes made to merged file
+  (e)  edit        - change merged file in an editor
+  (r)  resolved    - accept merged version of file
+  (mf) mine-full   - accept my version of entire file (ignore their changes)
+  (tf) theirs-full - accept their version of entire file (lose my changes)
+  (l)  launch      - launch external tool to resolve conflict
+  (h)  help        - show this list
 </screen>
 
       <para>Let's briefly review each of these options before we go
@@ -1189,7 +1189,7 @@
 
         <screen>
 ...
-Select: (p)ostpone, (d)iff, (e)dit, (h)elp for more options : d
+Select: (p) postpone, (df) diff-full, (e) edit, (h)elp for more options : d
 --- .svn/text-base/sandwich.txt.svn-base      Tue Dec 11 21:33:57 2007
 +++ .svn/tmp/tempfile.32.tmp     Tue Dec 11 21:34:33 2007
 @@ -1 +1,5 @@
@@ -1371,7 +1371,7 @@
         <screen>
 $ svn update
 Conflict discovered in 'sandwich.txt'.
-Select: (p)ostpone, (d)iff, (e)dit, (h)elp for more options : p
+Select: (p) postpone, (df) diff-full, (e) edit, (h)elp for more options : p
 C  sandwich.txt
 Updated to revision 2.
 $ ls -1

Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml	(original)
+++ trunk/src/en/book/ch09-reference.xml	Mon Mar 31 22:59:51 2008
@@ -55,8 +55,8 @@
           <listitem>
             <para>Specify action for automatic conflict resolution.
               Possible actions are (<literal>postpone</literal>,
-              <literal>base</literal>, <literal>mine</literal>,
-              <literal>theirs</literal>, <literal>edit</literal>, and
+              <literal>base</literal>, <literal>mine-full</literal>,
+              <literal>theirs-full</literal>, <literal>edit</literal>, and
               <literal>launch</literal></para>
           </listitem>
         </varlistentry>




More information about the svnbook-dev mailing list