[svnbook] r3931 committed - Update example output to match reality.

svnbook at googlecode.com svnbook at googlecode.com
Fri Jul 29 09:34:55 CDT 2011


Revision: 3931
Author:   cmpilato at gmail.com
Date:     Fri Jul 29 07:33:49 2011
Log:      Update example output to match reality.
http://code.google.com/p/svnbook/source/detail?r=3931

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

=======================================
--- /trunk/src/en/book/ch02-basic-usage.xml	Thu Jul 28 08:28:00 2011
+++ /trunk/src/en/book/ch02-basic-usage.xml	Fri Jul 29 07:33:49 2011
@@ -573,8 +573,8 @@
        <informalexample>
          <screen>
  $ svn update
-U  foo.c
-U  bar.c
+U    foo.c
+U    bar.c
  Updated to revision 2.
  $
  </screen>
@@ -1275,8 +1275,8 @@
        <informalexample>
          <screen>
  $ svn update
-U  INSTALL
-G  README
+U    INSTALL
+G    README
  Conflict discovered in 'bar.c'.
  Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
@@ -1693,8 +1693,10 @@
  Select: (p) postpone, (df) diff-full, (e) edit,
          (mc) mine-conflict, (tc) theirs-conflict,
          (s) show all options: p
-C  sandwich.txt
+C    sandwich.txt
  Updated to revision 2.
+Summary of conflicts:
+  Text conflicts: 1
  $ ls -1
  sandwich.txt
  sandwich.txt.mine
@@ -1911,6 +1913,8 @@
          (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




More information about the svnbook-dev mailing list