[svnbook] r4373 committed - Merge from ^/trunk/en r4370-r4372 (minor, mostly formatting, tweaks).
svnbook at googlecode.com
svnbook at googlecode.com
Tue Jan 29 12:26:39 CST 2013
Revision: 4373
Author: cmpilato at gmail.com
Date: Tue Jan 29 10:25:41 2013
Log: Merge from ^/trunk/en r4370-r4372 (minor, mostly formatting,
tweaks).
http://code.google.com/p/svnbook/source/detail?r=4373
Modified:
/branches/1.7/en
/branches/1.7/en/book/ch02-basic-usage.xml
/branches/1.7/en/book/ch03-advanced-topics.xml
/branches/1.7/en/book/ch04-branching-and-merging.xml
/branches/1.7/en/book/ch05-repository-admin.xml
/branches/1.7/en/book/ch06-server-configuration.xml
=======================================
--- /branches/1.7/en/book/ch02-basic-usage.xml Thu Dec 15 10:44:56 2011
+++ /branches/1.7/en/book/ch02-basic-usage.xml Tue Jan 29 10:25:41 2013
@@ -2590,15 +2590,12 @@
</screen>
</informalexample>
- <!-- ### TODO: This changes a bit in 1.7 -->
-
<para>Lastly, if you're building a release and wish to bundle up
- your files from Subversion but don't want those
- pesky <filename>.svn</filename> directories in the way, you
- can use <command>svn export</command> to create a local copy
- of all or part of your repository
- sans <filename>.svn</filename> directories. The basic syntax
- of this subcommand is identical to that of <command>svn
+ your versioned files and directories, you can use <command>svn
+ export</command> to create a local copy of all or part of your
+ repository without any <filename>.svn</filename>
+ administrative directories included. The basic syntax of this
+ subcommand is identical to that of <command>svn
checkout</command>:</para>
<informalexample>
@@ -2933,7 +2930,11 @@
<informalexample>
<screen>
-$ svn info code/bar.c | tail -n 4
+$ svn info code/bar.c
+Path: code/bar.c
+Name: bar.c
+URL: http://svn.example.com/svn/repo/trunk/code/bar.c
+…
Tree conflict: local edit, incoming delete upon update
Source left: (file) ^/trunk/code/bar.c at 4
Source right: (none) ^/trunk/code/bar.c at 5
=======================================
--- /branches/1.7/en/book/ch03-advanced-topics.xml Wed Jan 16 10:48:39 2013
+++ /branches/1.7/en/book/ch03-advanced-topics.xml Tue Jan 29 10:25:41 2013
@@ -230,17 +230,17 @@
<informalexample>
<screen>
-$ svn checkout -r {2006-02-17}
-$ svn checkout -r {15:30}
-$ svn checkout -r {15:30:00.200000}
-$ svn checkout -r {"2006-02-17 15:30"}
-$ svn checkout -r {"2006-02-17 15:30 +0230"}
-$ svn checkout -r {2006-02-17T15:30}
-$ svn checkout -r {2006-02-17T15:30Z}
-$ svn checkout -r {2006-02-17T15:30-04:00}
-$ svn checkout -r {20060217T1530}
-$ svn checkout -r {20060217T1530Z}
-$ svn checkout -r {20060217T1530-0500}
+$ svn update -r {2006-02-17}
+$ svn update -r {15:30}
+$ svn update -r {15:30:00.200000}
+$ svn update -r {"2006-02-17 15:30"}
+$ svn update -r {"2006-02-17 15:30 +0230"}
+$ svn update -r {2006-02-17T15:30}
+$ svn update -r {2006-02-17T15:30Z}
+$ svn update -r {2006-02-17T15:30-04:00}
+$ svn update -r {20060217T1530}
+$ svn update -r {20060217T1530Z}
+$ svn update -r {20060217T1530-0500}
…
</screen>
</informalexample>
@@ -833,7 +833,7 @@
<informalexample>
<screen>
$ svn commit -m "Fix up the last remaining known regression bug." \
- --with-revprop "test-results=all passing"
+ --with-revprop "test-results=all passing"
Sending lib/crit_bits.c
Transmitting file data .
Committed revision 912.
@@ -2258,12 +2258,12 @@
and still expanded correctly:</para>
<informalexample>
- <screen>
+ <programlisting>
Here is the latest report from the front lines.
$LastChangedDate: 2006-07-22 21:42:37 -0700 (Sat, 22 Jul 2006) $
$Rev$
Cumulus clouds are appearing more frequently as summer approaches.
-</screen>
+</programlisting>
</informalexample>
<para>If someone else now commits a change to
@@ -2323,11 +2323,11 @@
like:</para>
<informalexample>
- <screen>
+ <programlisting>
$Rev$: Revision of last commit
$Author$: Author of last commit
$Date$: Date of last commit
-</screen>
+</programlisting>
</informalexample>
<para>Now, that looks nice and tabular at the start of things.
@@ -2335,11 +2335,11 @@
enabled, of course), you see:</para>
<informalexample>
- <screen>
+ <programlisting>
$Rev: 12 $: Revision of last commit
$Author: harry $: Author of last commit
$Date: 2006-03-15 02:33:03 -0500 (Wed, 15 Mar 2006) $: Date of last
commit
-</screen>
+</programlisting>
</informalexample>
<para>The result is not so beautiful. And you might be
@@ -2354,11 +2354,11 @@
seem sane, so your file might look like this:</para>
<informalexample>
- <screen>
+ <programlisting>
$Rev:: $: Revision of last commit
$Author:: $: Author of last commit
$Date:: $: Date of last commit
-</screen>
+</programlisting>
</informalexample>
<para>You commit this change to your file. This time,
@@ -2372,11 +2372,11 @@
field is truncated by a hash character:</para>
<informalexample>
- <screen>
+ <programlisting>
$Rev:: 13 $: Revision of last commit
$Author:: harry $: Author of last commit
$Date:: 2006-03-15 0#$: Date of last commit
-</screen>
+</programlisting>
</informalexample>
<para>The use of fixed-length keywords is especially handy when
@@ -4270,7 +4270,7 @@
<informalexample>
<screen>
$ svn commit -m "Fix a UI bug found while working on math logic." \
- --changelist ui-fix
+ --changelist ui-fix
Sending button.c
Transmitting file data .
Committed revision 1158.
=======================================
--- /branches/1.7/en/book/ch04-branching-and-merging.xml Tue Jan 3
10:44:42 2012
+++ /branches/1.7/en/book/ch04-branching-and-merging.xml Tue Jan 29
10:25:41 2013
@@ -179,7 +179,7 @@
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/my-calc-branch \
- -m "Creating a private branch of /calc/trunk."
+ -m "Creating a private branch of /calc/trunk."
Committed revision 341.
$
@@ -1128,7 +1128,7 @@
<informalexample>
<screen>
$ svn delete ^/calc/branches/my-calc-branch \
- -m "Remove my-calc-branch, reintegrated with trunk in r391."
+ -m "Remove my-calc-branch, reintegrated with trunk in r391."
Committed revision 392.
</screen>
</informalexample>
@@ -1156,12 +1156,12 @@
<informalexample>
<screen>
$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
- -m "Remove my-calc-branch, reintegrated with trunk in r391."
+ -m "Remove my-calc-branch, reintegrated with trunk in r391."
Committed revision 392.
$ svn copy http://svn.example.com/repos/calc/trunk \
- http://svn.example.com/repos/calc/branches/my-calc-branch
- -m "Recreate my-calc-branch from trunk at HEAD."
+ http://svn.example.com/repos/calc/branches/my-calc-branch \
+ -m "Recreate my-calc-branch from trunk at HEAD."
Committed revision 393.
</screen>
</informalexample>
@@ -1714,7 +1714,7 @@
<informalexample>
<screen>
$ svn copy ^/calc/trunk/real.c at 807 ^/calc/trunk/ \
- -m "Resurrect real.c from revision 807."
+ -m "Resurrect real.c from revision 807."
Committed revision 1390.
$ svn update
@@ -3135,7 +3135,7 @@
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/newbranch \
- -m "Create branch 'newbranch'."
+ -m "Create branch 'newbranch'."
Committed revision 353.
$ svn switch ^/calc/branches/newbranch
At revision 353.
@@ -3188,7 +3188,7 @@
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/tags/release-1.0 \
- -m "Tagging the 1.0 release of the 'calc' project."
+ -m "Tagging the 1.0 release of the 'calc' project."
Committed revision 902.
</screen>
=======================================
--- /branches/1.7/en/book/ch05-repository-admin.xml Fri Jan 25 11:05:39 2013
+++ /branches/1.7/en/book/ch05-repository-admin.xml Tue Jan 29 10:25:41 2013
@@ -273,7 +273,7 @@
<para>For example, your repository might look like this:</para>
<informalexample>
- <screen>
+ <literallayout>
/
calc/
trunk/
@@ -288,7 +288,7 @@
tags/
branches/
…
-</screen>
+</literallayout>
</informalexample>
<para>Note that it doesn't matter where in your repository each
@@ -302,7 +302,7 @@
like this:</para>
<informalexample>
- <screen>
+ <literallayout>
/
utils/
calc/
@@ -320,7 +320,7 @@
tags/
branches/
…
-</screen>
+</literallayout>
</informalexample>
<para>Lay out your repository in whatever way you see fit.
@@ -338,7 +338,7 @@
subdirectories beneath those, like so:</para>
<informalexample>
- <screen>
+ <literallayout>
/
trunk/
calc/
@@ -355,7 +355,7 @@
calendar/
spreadsheet/
…
-</screen>
+</literallayout>
</informalexample>
<para>There's nothing particularly incorrect about such a
@@ -2276,9 +2276,9 @@
<informalexample>
<screen>
$ svn mkdir -m "Initial project roots" \
- file:///var/svn/projects/calc \
- file:///var/svn/projects/calendar \
- file:///var/svn/projects/spreadsheet
+ file:///var/svn/projects/calc \
+ file:///var/svn/projects/calendar \
+ file:///var/svn/projects/spreadsheet
Committed revision 1.
$
</screen>
=======================================
--- /branches/1.7/en/book/ch06-server-configuration.xml Tue Nov 8 08:54:48
2011
+++ /branches/1.7/en/book/ch06-server-configuration.xml Tue Jan 29 10:25:41
2013
@@ -1144,8 +1144,8 @@
<informalexample>
<programlisting>
- [sasl]
- use-sasl = true
+[sasl]
+use-sasl = true
</programlisting>
</informalexample>
@@ -2886,7 +2886,7 @@
this:</para>
<informalexample>
- <screen>
+ <programlisting>
[26/Jan/2007:22:25:29 -0600] "PROPFIND /svn/calc/!svn/vcc/default
HTTP/1.1" 207 398
[26/Jan/2007:22:25:29 -0600] "PROPFIND /svn/calc/!svn/bln/59 HTTP/1.1" 207
449
[26/Jan/2007:22:25:29 -0600] "PROPFIND /svn/calc HTTP/1.1" 207 647
@@ -2894,7 +2894,7 @@
[26/Jan/2007:22:25:31 -0600] "OPTIONS /svn/calc HTTP/1.1" 200 188
[26/Jan/2007:22:25:31 -0600] "MKACTIVITY
/svn/calc/!svn/act/e6035ef7-5df0-4ac0-b811-4be7c823f998 HTTP/1.1" 201 227
…
-</screen>
+</programlisting>
</informalexample>
<para>you can peruse a much more
@@ -2902,12 +2902,12 @@
this:</para>
<informalexample>
- <screen>
+ <programlisting>
[26/Jan/2007:22:24:20 -0600] - get-dir /tags r1729 props
[26/Jan/2007:22:24:27 -0600] - update /trunk r1729 depth=infinity
[26/Jan/2007:22:25:29 -0600] - status /trunk/foo r1729 depth=infinity
[26/Jan/2007:22:25:31 -0600] sally commit r1730
-</screen>
+</programlisting>
</informalexample>
<para>In addition to the <literal>SVN-ACTION</literal>
More information about the svnbook-dev
mailing list