[svnbook commit] r2984 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Tue Feb 26 07:39:17 CST 2008
Author: cmpilato
Date: Tue Feb 26 07:39:15 2008
New Revision: 2984
Log:
Phrasing tweaks and typo fixes.
Modified:
trunk/src/en/book/ch03-advanced-topics.xml
trunk/src/en/book/ch08-embedding-svn.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 Tue Feb 26 07:39:15 2008
@@ -1430,10 +1430,10 @@
? calc/data.c
</screen>
- <para>Now, all that cruft is missing from the output! Of course,
- your <filename>calculator</filename> compiled program and all
- those logfiles are still in your working copy. Subversion is
- simply not reminding you that they are present and unversioned.
+ <para>Now, all that cruft is missing from the output! Your
+ <filename>calculator</filename> compiled program and all those
+ logfiles are still in your working copy; Subversion just isn't
+ constantly reminding you that they are present and unversioned.
And now with all the uninteresting noise removed from the
display, you are left with more interesting items—such as
that source code file <filename>data.c</filename> that you
@@ -2137,7 +2137,7 @@
made, and spit out an image of a busted-up red Mustang with a
cracked windshield!</para>
- <para>Clearly, things would have gone more smoothly if Harry and
+ <para>Of course, things would have gone more smoothly if Harry and
Sally had serialized their modifications to the image—if, say,
Harry had waited to draw his windshield cracks on Sally's
now-red car, or if Sally had tweaked the color of a car whose
@@ -2851,7 +2851,7 @@
backdate your working copy to a previous revision, your
externals definitions will also revert to the way they looked
in that previous revision, which in turn means that the
- external working copies will be updated to match they way
+ external working copies will be updated to match the way
<emphasis>they</emphasis> looked back when your repository was
at that previous revision. For software projects, this could
be the difference between a successful and a failed build of
@@ -2990,16 +2990,16 @@
<para>The simplest example of this occurs when a directory or file
is deleted from version control, and then a new directory or
file is created with the same name and added to version control.
- Clearly the thing you deleted and the thing you later added
- aren't the same thing. They merely happen to have had the same
- path, <filename>/trunk/object</filename> for example. What,
- then, does it mean to ask Subversion about the history of
+ The thing you deleted and the thing you later added aren't the
+ same thing. They merely happen to have had the same path,
+ <filename>/trunk/object</filename> for example. What, then,
+ does it mean to ask Subversion about the history of
<filename>/trunk/object</filename>? Are you asking about the
thing currently at that location, or the old thing you deleted
from that location? Are you asking about the operations that
have happened to <emphasis>all</emphasis> the objects that have
- ever lived at that path? Clearly, Subversion needs a hint about
- what you really want.</para>
+ ever lived at that path? Subversion needs a hint about what you
+ really want.</para>
<para>And thanks to moves, versioned object history can get far
more twisted than that, even. For example, you might have a
Modified: trunk/src/en/book/ch08-embedding-svn.xml
==============================================================================
--- trunk/src/en/book/ch08-embedding-svn.xml (original)
+++ trunk/src/en/book/ch08-embedding-svn.xml Tue Feb 26 07:39:15 2008
@@ -1240,13 +1240,10 @@
return code_map.get(status, '?')
def do_status(wc_path, verbose):
- # Calculate the length of the input working copy path.
- wc_path_len = len(wc_path)
-
# Build a client context baton.
ctx = svn.client.svn_client_ctx_t()
- def _status_callback(path, status, root_path_len=wc_path_len):
+ def _status_callback(path, status):
"""A callback function for svn_client_status."""
# Print the path, minus the bit that overlaps with the root of
More information about the svnbook-dev
mailing list