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

cmpilato noreply at red-bean.com
Mon Jun 16 11:41:24 CDT 2008


Author: cmpilato
Date: Mon Jun 16 11:41:24 2008
New Revision: 3144

Log:
* src/en/book/ch03-advanced-topics.xml
  Fix the examples of property conflicts to track the state of the art.

Suggested by: Karl Heinz Marbaise



Modified:
   trunk/src/en/book/ch03-advanced-topics.xml

Modified: trunk/src/en/book/ch03-advanced-topics.xml
==============================================================================
--- trunk/src/en/book/ch03-advanced-topics.xml	(original)
+++ trunk/src/en/book/ch03-advanced-topics.xml	Mon Jun 16 11:41:24 2008
@@ -714,9 +714,10 @@
       <para>Notice how the <command>status</command> subcommand
         displays <literal>M</literal> in the second column instead of
         the first.  That is because we have modified the properties on
-        <filename>calc/button.c</filename>, but not its
-        textual contents.  Had we changed both, we would have seen
-        <literal>M</literal> in the first column, too (see <xref
+        <filename>calc/button.c</filename>, but not its textual
+        contents.  Had we changed both, we would have seen
+        <literal>M</literal> in the first column, too.  (We cover
+        <command>svn status</command> in <xref
         linkend="svn.tour.cycle.examine.status" />).</para>
 
       <sidebar>
@@ -732,6 +733,9 @@
         <screen>
 $ svn update calc
 M  calc/Makefile.in
+Conflict for property 'linecount' discovered on 'calc/button.c'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (s) show all options: p
  C calc/button.c
 Updated to revision 143.
 $ 
@@ -752,7 +756,8 @@
  C     calc/button.c
 ?      calc/button.c.prej
 $ cat calc/button.c.prej 
-prop 'linecount': user set to '1256', but update set to '1301'.
+Trying to change property 'linecount' from '1267' to '1301',
+but property has been locally changed from '1267' to '1256'.
 $
 </screen>
  




More information about the svnbook-dev mailing list