[svnbook] r5143 committed - trunk/en/book/ch02-basic-usage.xml

lyalyakin at users.sourceforge.net lyalyakin at users.sourceforge.net
Fri May 27 06:21:27 CDT 2016


Revision: 5143
          http://sourceforge.net/p/svnbook/source/5143
Author:   lyalyakin
Date:     2016-05-27 11:21:26 +0000 (Fri, 27 May 2016)
Log Message:
-----------
Issue #266. Discovered during the read-thru process.

* en/book/ch02-basic-usage.xml.
  (svn.tour.cycle.resolve): Update <screen> output to match the one
   SVN 1.8 produces and add new new (m) option to the list.

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

Modified: trunk/en/book/ch02-basic-usage.xml
===================================================================
--- trunk/en/book/ch02-basic-usage.xml	2016-05-26 20:34:49 UTC (rev 5142)
+++ trunk/en/book/ch02-basic-usage.xml	2016-05-27 11:21:26 UTC (rev 5143)
@@ -1314,10 +1314,10 @@
 U    INSTALL
 G    README
 Conflict discovered in 'bar.c'.
-Select: (p) postpone, (df) diff-full, (e) edit,
-        (mc) mine-conflict, (tc) theirs-conflict,
-        (s) show all options: 
-</screen>
+Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
+        (mc) my side of conflict, (tc) their side of conflict,
+        (s) show all options:
+        </screen>
       </informalexample>
 
       <para>The <computeroutput>U</computeroutput> (which stands for
@@ -1349,27 +1349,30 @@
       <informalexample>
         <screen>
 …
-Select: (p) postpone, (df) diff-full, (e) edit,
-        (mc) mine-conflict, (tc) theirs-conflict,
+Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
+        (mc) my side of conflict, (tc) their side of conflict,
         (s) show all options: s
 
-  (e)  edit             - change merged file in an editor
-  (df) diff-full        - show all changes made to merged file
-  (r)  resolved         - accept merged version of file
+  (e)  - change merged file in an editor  [edit]
+  (df) - show all changes made to merged file
+  (r)  - accept merged version of file
 
-  (dc) display-conflict - show all conflicts (ignoring merged version)
-  (mc) mine-conflict    - accept my version for all conflicts (same)
-  (tc) theirs-conflict  - accept their version for all conflicts (same)
+  (dc) - show all conflicts (ignoring merged version)
+  (mc) - accept my version for all conflicts (same)  [mine-conflict]
+  (tc) - accept their version for all conflicts (same)  [theirs-conflict]
 
-  (mf) mine-full        - accept my version of entire file (even non-conflicts)
-  (tf) theirs-full      - accept their version of entire file (same)
+  (mf) - accept my version of entire file (even non-conflicts)  [mine-full]
+  (tf) - accept their version of entire file (same)  [theirs-full]
 
-  (p)  postpone         - mark the conflict to be resolved later
-  (l)  launch           - launch external tool to resolve conflict
-  (s)  show all         - show this list
+  (m)  - use internal merge tool to resolve conflict
+  (l)  - launch external tool to resolve conflict  [launch]
+  (p)  - mark the conflict to be resolved later  [postpone]
+  (q)  - postpone all remaining conflicts
+  (s)  - show this list (also 'h', '?')
+Words in square brackets are the corresponding --accept option arguments.
 
-Select: (p) postpone, (df) diff-full, (e) edit,
-        (mc) mine-conflict, (tc) theirs-conflict,
+Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
+        (mc) my side of conflict, (tc) their side of conflict,
         (s) show all options:
 </screen>
       </informalexample>
@@ -1379,7 +1382,7 @@
 
       <variablelist>
         <varlistentry>
-          <term><computeroutput>(e)  edit</computeroutput></term>
+          <term><computeroutput>(e)  edit  [edit]</computeroutput></term>
           <listitem>
             <para>Open the file in conflict with your favorite editor,
               as set in the environment variable
@@ -1388,7 +1391,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><computeroutput>(df) diff-full</computeroutput></term>
+          <term><computeroutput>(df)  diff-full</computeroutput></term>
           <listitem>
             <para>Display the differences between the base revision
               and the conflicted file itself in unified diff format.</para>
@@ -1407,7 +1410,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><computeroutput>(dc) display-conflict</computeroutput></term>
+          <term><computeroutput>(dc)  display-conflict</computeroutput></term>
           <listitem>
             <para>Display all conflicting regions of the file,
               ignoring changes which were successfully merged.</para>
@@ -1415,7 +1418,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><computeroutput>(mc) mine-conflict</computeroutput></term>
+          <term><computeroutput>(mc)  mine-conflict  [mine-conflict]</computeroutput></term>
           <listitem>
             <para>Discard any newly received changes from the server
               which conflict with your local changes to the file under
@@ -1425,7 +1428,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><computeroutput>(tc) theirs-conflict</computeroutput></term>
+          <term><computeroutput>(tc)  theirs-conflict  [theirs-conflict]</computeroutput></term>
           <listitem>
             <para>Discard any local changes which conflict with
               incoming changes from the server for the file under
@@ -1435,7 +1438,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><computeroutput>(mf) mine-full</computeroutput></term>
+          <term><computeroutput>(mf)  mine-full  [mine-full]</computeroutput></term>
           <listitem>
             <para>Discard all newly received changes from the server
               for the file under review, but preserve all your local
@@ -1444,7 +1447,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><computeroutput>(tf) theirs-full</computeroutput></term>
+          <term><computeroutput>(tf)  theirs-full  [theirs-full]</computeroutput></term>
           <listitem>
             <para>Discard all your local changes to the file under
               review and use only the newly received changes from the
@@ -1453,10 +1456,11 @@
         </varlistentry>
 
         <varlistentry>
-          <term><computeroutput>(p)  postpone</computeroutput></term>
+          <term><computeroutput>(m)  merge</computeroutput></term>
           <listitem>
-            <para>Leave the file in a conflicted state for you to
-              resolve after your update is complete.</para>
+            <para>Launch an internal merge tool to perform the
+              conflict resolution.  The option is available starting
+              with Subversion 1.8.</para>
           </listitem>
         </varlistentry>
 
@@ -1470,6 +1474,14 @@
         </varlistentry>
 
         <varlistentry>
+          <term><computeroutput>(p)  postpone  [postpone]</computeroutput></term>
+          <listitem>
+            <para>Leave the file in a conflicted state for you to
+              resolve after your update is complete.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term><computeroutput>(s)  show all</computeroutput></term>
           <listitem>
             <para>Show the list of all possible commands you can use




More information about the svnbook-dev mailing list