[svnbook] r3998 committed - * en/book/ch03-advanced-topics.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Mon Aug 15 14:26:59 CDT 2011
Revision: 3998
Author: cmpilato at gmail.com
Date: Mon Aug 15 12:22:38 2011
Log: * en/book/ch03-advanced-topics.xml
* en/book/ch01-fundamental-concepts.xml
* en/book/ch02-basic-usage.xml
Begin updating 'update' examples to show the new header line(s).
http://code.google.com/p/svnbook/source/detail?r=3998
Modified:
/trunk/en/book/ch01-fundamental-concepts.xml
/trunk/en/book/ch02-basic-usage.xml
/trunk/en/book/ch03-advanced-topics.xml
=======================================
--- /trunk/en/book/ch01-fundamental-concepts.xml Tue Jul 5 09:25:22 2011
+++ /trunk/en/book/ch01-fundamental-concepts.xml Mon Aug 15 12:22:38 2011
@@ -902,6 +902,7 @@
$ ls -A
Makefile button.c integer.c .svn/
$ svn update
+Updating '.':
U button.c
Updated to revision 57.
$
=======================================
--- /trunk/en/book/ch02-basic-usage.xml Fri Jul 29 07:33:49 2011
+++ /trunk/en/book/ch02-basic-usage.xml Mon Aug 15 12:22:38 2011
@@ -573,6 +573,7 @@
<informalexample>
<screen>
$ svn update
+Updating '.':
U foo.c
U bar.c
Updated to revision 2.
@@ -1275,6 +1276,7 @@
<informalexample>
<screen>
$ svn update
+Updating '.':
U INSTALL
G README
Conflict discovered in 'bar.c'.
@@ -1689,6 +1691,7 @@
<informalexample>
<screen>
$ svn update
+Updating '.':
Conflict discovered in 'sandwich.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
@@ -1907,6 +1910,7 @@
<informalexample>
<screen>
$ svn update
+Updating '.':
Conflict discovered in 'sandwich.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
@@ -2544,6 +2548,7 @@
<screen>
# Make the current directory look like it did in r1729.
$ svn update -r 1729
+Updating '.':
…
$
</screen>
@@ -2863,6 +2868,7 @@
<informalexample>
<screen>
$ svn update
+Updating '.':
C code/bar.c
A code/baz.c
U Makefile
=======================================
--- /trunk/en/book/ch03-advanced-topics.xml Mon Aug 15 12:17:58 2011
+++ /trunk/en/book/ch03-advanced-topics.xml Mon Aug 15 12:22:38 2011
@@ -1215,6 +1215,7 @@
<informalexample>
<screen>
$ svn update calc
+Updating 'calc':
M calc/Makefile.in
Conflict for property 'linecount' discovered on 'calc/button.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
@@ -2544,14 +2545,17 @@
<informalexample>
<screen>
$ svn update --set-depth files mom-empty
+Updating 'mom-empty':
A mom-empty/kittie1.txt
A mom-empty/doggie1.txt
Updated to revision 1.
$ svn update --set-depth immediates mom-empty
+Updating 'mom-empty':
A mom-empty/son
A mom-empty/daughter
Updated to revision 1.
$ svn update --set-depth infinity mom-empty
+Updating 'mom-empty':
A mom-empty/son/grandson
A mom-empty/daughter/granddaughter1
A mom-empty/daughter/granddaughter1/bunny1.txt
@@ -2584,12 +2588,15 @@
$ svn checkout file:///var/svn/repos mom-empty --depth empty
Checked out revision 1.
$ svn update --set-depth empty mom-empty/son
+Updating 'mom-empty/son':
A mom-empty/son
Updated to revision 1.
$ svn update --set-depth empty mom-empty/daughter
+Updating 'mom-empty/daughter':
A mom-empty/daughter
Updated to revision 1.
$ svn update --set-depth infinity mom-empty/daughter/granddaughter1
+Updating 'mom-empty/daughter/granddaughter1':
A mom-empty/daughter/granddaughter1
A mom-empty/daughter/granddaughter1/bunny1.txt
A mom-empty/daughter/granddaughter1/bunny2.txt
@@ -3280,6 +3287,7 @@
B 32 raisin.jpg
Status against revision: 105
$ svn update
+Updating '.':
B raisin.jpg
Updated to revision 105.
$ svn status
@@ -3629,6 +3637,7 @@
Committed revision 12.
$ svn update
+Updating '.':
Fetching external item into 'renamed-project/some-dir/subdir'
svn: Target path does not exist
@@ -3742,6 +3751,8 @@
$ svn propget svn:externals www/
^/trunk/bikeshed/blue.html at 40 green.html
$ svn update
+Updating '.':
+
Fetching external item into 'www'
E www/green.html
Updated external to revision 40.
More information about the svnbook-dev
mailing list