[svnbook] r4001 committed - Finish Issue 116 ("1.7 change: 'svn update' prints a header line")....
svnbook at googlecode.com
svnbook at googlecode.com
Mon Aug 15 14:39:08 CDT 2011
Revision: 4001
Author: cmpilato at gmail.com
Date: Mon Aug 15 12:33:48 2011
Log: Finish Issue 116 ("1.7 change: 'svn update' prints a header
line").
* en/book/ch09-reference.xml
* en/book/ch04-branching-and-merging.xml
Finish (I think) updating 'svn update' example output.
http://code.google.com/p/svnbook/source/detail?r=4001
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
/trunk/en/book/ch09-reference.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Tue Aug 9 07:51:18 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Mon Aug 15 12:33:48 2011
@@ -760,6 +760,7 @@
/home/user/calc-trunk
$ svn update # (make sure the working copy is up to date)
+Updating '.':
At revision 390.
$ svn merge --reintegrate ^/calc/branches/my-calc-branch
@@ -1258,6 +1259,7 @@
Committed revision 1390.
$ svn update
+Updating '.':
A real.c
Updated to revision 1390.
</screen>
@@ -1910,6 +1912,7 @@
<screen>
$ cd my-calc-branch
$ svn update
+Updating '.':
Updated to revision 393.
$ svn merge --record-only -c 391 ^/calc/trunk
$ svn commit -m "Block revision 391 from being merged into my-calc-branch."
@@ -3013,6 +3016,7 @@
$ cd trunk-working-copy
$ svn update
+Updating '.':
At revision 1910.
$ svn merge --reintegrate ^/calc/branches/mybranch
=======================================
--- /trunk/en/book/ch09-reference.xml Tue Aug 9 13:21:16 2011
+++ /trunk/en/book/ch09-reference.xml Mon Aug 15 12:33:48 2011
@@ -1279,6 +1279,7 @@
svn: The operation was interrupted
svn: caught SIGINT
$ svn update mine
+Updating 'mine':
A mine/d
Updated to revision 20.
$
@@ -4254,6 +4255,7 @@
<informalexample>
<screen>
$ svn update
+Updating '.':
Conflict discovered in 'foo.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
@@ -4330,6 +4332,7 @@
<informalexample>
<screen>
$ svn update
+Updating '.':
C foo.c
Updated to revision 31.
Summary of conflicts:
@@ -5089,6 +5092,7 @@
$ mv /var/svn/repos /var/svn/newlocation
$ svn update test/
+Updating 'test':
svn: Unable to open an ra_local session to URL
svn: Unable to open repository 'file:///var/svn/repos'
@@ -5096,6 +5100,7 @@
file:///var/svn/tmp/newlocation test/
$ svn update test/
+Updating 'test':
At revision 3.
</screen>
</informalexample>
@@ -5339,6 +5344,7 @@
<informalexample>
<screen>
$ svn update
+Updating '.':
A newdir/toggle.c
A newdir/disclose.c
A newdir/launch.c
@@ -5355,6 +5361,7 @@
<informalexample>
<screen>
$ svn update -r30
+Updating '.':
A newdir/README
D newdir/toggle.c
D newdir/disclose.c
More information about the svnbook-dev
mailing list