[svnbook commit] r3293 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Thu Sep 4 10:52:12 CDT 2008
Author: cmpilato
Date: Thu Sep 4 10:52:10 2008
New Revision: 3293
Log:
* src/en/book/ch03-advanced-topics.xml,
* src/en/book/ch04-branching-and-merging.xml
Tweak some wording to avoid implying untrue things only revealed as
untrue if the reader keeps reading long enough to hit the revelation.
. o O ( Huh? )
Suggested by: James Kistruck <James.Kistruck {at} dataconnection.com>
Modified:
trunk/src/en/book/ch03-advanced-topics.xml
trunk/src/en/book/ch04-branching-and-merging.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 Thu Sep 4 10:52:10 2008
@@ -3461,7 +3461,7 @@
<para>Subversion 1.5 brings a new
<firstterm>changelists</firstterm> feature that adds yet
another method to the mix. Changelists are basically arbitrary
- labels applied to working copy files for the express purpose of
+ labels (currently at most one per file) applied to working copy files for the express purpose of
associating multiple files together. Users of many of Google's
software offerings are familiar with this concept already. For
example, <ulink url="http://mail.google.com/">Gmail</ulink>
Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml Thu Sep 4 10:52:10 2008
@@ -2121,9 +2121,10 @@
URL: http://svn.example.com/repos/calc/branches/my-calc-branch
</screen>
- <para>After <quote>switching</quote> to the branch, your working
- copy is no different from what you would get from doing a fresh
- checkout of the directory. And it's usually more efficient to
+ <para><quote>Switching</quote> a working copy that has no local
+ modifications to a different branch results in the working copy
+ looking just as it would had you done a fresh checkout of the
+ directory. It's usually more efficient to
use this command, because often branches differ by only a small
degree. The server sends only the minimal set of changes
necessary to make your working copy reflect the branch
More information about the svnbook-dev
mailing list