Index: appa.xml
===================================================================
--- appa.xml (revision 6931)
+++ appa.xml (working copy)
@@ -5,7 +5,7 @@
This appendix is a guide for CVS users new to Subversion.
It's essentially a list of differences between the two systems
- as viewed from 10,000 feet. For each section, we
+ as viewed from 10,000 feet. For each section, we
provide backreferences to relevant chapters when
possible.
@@ -33,14 +33,14 @@
filesystem. Each commit results in an entirely new filesystem
tree; in essence, the repository is an array of trees. Each of
these trees is labeled with a single revision number. When
- someone talks about revision 54, they're talking
+ someone talks about revision 54, they're talking
about a particular tree (and indirectly, the way the filesystem
looked after the 54th commit).
Technically, it's not valid to talk about revision 5
of foo.c. Instead, one would say
foo.c as it appears in revision
- 5. Also, be careful when making assumptions about the
+ 5. Also, be careful when making assumptions about the
evolution of a file. In CVS, revisions 5 and 6 of
foo.c are always different. In Subversion,
it's most likely that foo.c did
@@ -151,7 +151,7 @@
svn status
- Shows you any local changes you've made. (see Shows you any local changes you've made (see )
@@ -159,7 +159,7 @@
svn diff
- Shows you the details of your changes. (see Shows you the details of your changes (see )
@@ -167,7 +167,7 @@
svn revert
- Removes your local changes. (see Removes your local changes (see )
@@ -398,7 +398,7 @@
performs any kind of keyword or line-ending translation unless
you explicitly ask it do so (see and for more details.) By default,
+ linkend="svn-ch-6-sect-2.3.5"/> for more details). By default,
Subversion treats all file data as literal byte strings, and
files are always stored in the repository in an untranslated
state.
@@ -406,7 +406,7 @@
Second, Subversion maintains an internal notion of whether a
file is text or binary data, but
this notion is only extant in the working
- copy. During a svn update, Subversion will
+ copy. During an svn update, Subversion will
perform contextual merges on locally modified text files, but
will not attempt to do so for binary files.
Index: appc.xml
===================================================================
--- appc.xml (revision 6931)
+++ appc.xml (working copy)
@@ -79,7 +79,7 @@
I just built the distribution binary, and when I try
to check out Subversion, I get an error about an
- Unrecognized URL scheme.
+ Unrecognized URL scheme.
@@ -146,7 +146,7 @@
action, then one or more lockfiles are left behind, along
with logfiles describing then unfinished
actions. (svn status will show an
- L next to locked directories).
+ L next to locked directories.)
Any other process that attempts to access the working
copy will fail when it sees the locks. To awaken your
Index: appd.xml
===================================================================
--- appd.xml (revision 6931)
+++ appd.xml (working copy)
@@ -87,7 +87,7 @@
(e.g. a property called color), and
others are wholly created and controlled by the WebDAV
server (e.g. a property that contains the last
- modification time of a file.) The former kind are
+ modification time of a file). The former kind are
called dead properties, and the latter
kind are called live properties.
Index: appe.xml
===================================================================
--- appe.xml (revision 6931)
+++ appe.xml (working copy)
@@ -13,7 +13,7 @@
Subversion client. Fortunately for those interested in
developing additional Subversion clients, Subversion is
implemented as a series of libraries. These libraries are
- accessible via C API, as well as other languages (See ).
This component design means that it's easy (well, at least
Index: ch02.xml
===================================================================
--- ch02.xml (revision 6931)
+++ ch02.xml (working copy)
@@ -466,7 +466,7 @@
Revisions
- A svn commit operation can publish
+ An svn commit operation can publish
changes to any number of files and directories as a single
atomic transaction. In your working copy, you can change
files' contents, create, delete, rename and copy files and
@@ -598,7 +598,7 @@
directory, and no changes to that file have been committed
to the repository since its working revision. A
svn commit of the file will do nothing,
- and a svn update of the file will do
+ and an svn update of the file will do
nothing.
@@ -609,8 +609,8 @@
directory, and no changes to that file have been committed
to the repository since its base revision. There are local
changes that have not been committed to the repository, thus
- a svn commit of the file will succeed in
- publishing your changes, and a svn update
+ an svn commit of the file will succeed in
+ publishing your changes, and an svn update
of the file will do nothing.
@@ -620,8 +620,8 @@
The file has not been changed in the working
directory, but it has been changed in the repository. The
file should eventually be updated, to make it current with
- the public revision. A svn commit of the
- file will do nothing, and a svn update of
+ the public revision. An svn commit of the
+ file will do nothing, and an svn update of
the file will fold the latest changes into your working
copy.
@@ -630,9 +630,9 @@
Locally changed, and out-of-dateThe file has been changed both in the
- working directory, and in the repository. A svn
+ working directory, and in the repository. An svn
commit of the file will fail with an "out-of-date"
- error. The file should be updated first; a svn
+ error. The file should be updated first; an svn
update command will attempt to merge the public
changes with the local changes. If Subversion can't
complete the merge in a plausible way automatically, it
Index: ch03.xml
===================================================================
--- ch03.xml (revision 6931)
+++ ch03.xml (working copy)
@@ -92,7 +92,7 @@
If at any point in the future you want to refer to that
- revision (We'll see how and why we might want to do that later
+ revision (we'll see how and why we might want to do that later
in this chapter), you can refer to it as
3.
@@ -148,7 +148,7 @@
The revision just before the last
revision in which an item changed. (Technically,
- COMMITTED - 1).
+ COMMITTED - 1.)
@@ -320,8 +320,8 @@
Since Subversion uses a copy-modify-merge
- model instead of lock-modify-unlock, (see ) you're now ready to start making changes
+ model instead of lock-modify-unlock (see ), you're now ready to start making changes
to the files and directories that you've checked out (known
collectively as your working
copy).
@@ -329,7 +329,7 @@
In other words, your working copy is now just
like any other collection of files and/or directories on your
systemWell, except for the fact that every
- directory within your working copyalso contains a
+ directory within your working copy also contains a
.svn subdirectory. But that's getting a
little ahead of ourselves.. You can edit and
change them, move them around, you can even delete the entire
@@ -660,7 +660,7 @@
addition. When bar is added to the
repository on the next commit, its copy-history is
recorded (as having originally come from
- foo.)
+ foo).
@@ -905,7 +905,7 @@
The second column tells the status of a file or
- directory's properties (See for more information on
properties). If an M
appears in the second column, then the properties have been
@@ -1009,7 +1009,7 @@
useful information—you'll need to update and get the
server changes on README before you
commit, or the repository will reject your commit for being
- out-of-date. (More on this subject later).
+ out-of-date. (More on this subject later.)
@@ -1237,7 +1237,7 @@
Subversion prints a C during
the update, and remembers that the file is
- conflicted.
+ conflicted.
@@ -1253,7 +1253,7 @@
- filename.*.mine
+ filename.mine This is your file as it existed in your working
copy before you updated your working copy—that
@@ -1263,7 +1263,7 @@
- filename.*.rOLDREV
+ filename.rOLDREVThis is the file that was the BASE revision
before you updated your working copy. That is, the
@@ -1273,7 +1273,7 @@
- filename.*.rNEWREV
+ filename.rNEWREVThis is the file that your Subversion client
just received from the server when you updated your
@@ -1284,12 +1284,10 @@
- Here * represents some random
- digits that Subversion chooses,
- OLDREV is the revision number of the
- file in your .svn directory, and
- NEWREV is the revision number of the
- repository HEAD.
+ Here OLDREV is the revision number
+ of the file in your .svn directory
+ and NEWREV is the revision number of
+ the repository HEAD.
@@ -1306,11 +1304,10 @@
C sandwich.txt
Updated to revision 2.
$ ls -1
-sandwich.txt
-sandwich.txt.r2
-sandwich.txt.r1
+sandwich.txt
sandwich.txt.mine
-$
+sandwich.txt.r1
+sandwich.txt.r2
@@ -1764,7 +1761,7 @@
At first glance, this seems like an error, but you need
to remember that while revisions are repository-wide,
svn log operates on a path in the
- repository (If you supply no path, Subversion defaults to
+ repository (if you supply no path, Subversion defaults to
"."). As a result, if you're operating
in a subdirectory of your working copy and attempt to log a
revision where nothing beneath your current directory
@@ -2016,9 +2013,9 @@
information within .svn), it tries to do
so as safely as possible. Before changing anything, it writes
its intentions to a logfile, executes the commands in the
- logfile, then removes the logfile (This is similar in design
+ logfile, then removes the logfile (this is similar in design
to a journaled filesystem). If a Subversion operation is
- interrupted (If you hit Control-C, or if the machine crashes,
+ interrupted (if you hit Control-C, or if the machine crashes,
for example), the logfiles remain on disk. By re-executing
the logfiles, Subversion can complete the previously started
operation, and your working copy can get itself back into a
Index: ch05.xml
===================================================================
--- ch05.xml (revision 6931)
+++ ch05.xml (working copy)
@@ -1830,7 +1830,7 @@
class="url">http://httpd.apache.org. For
example, a general reference for the configuration directives
is located at http://httpd.apache.org/docs-2.0/mod/directives.html.)
+ class="url">http://httpd.apache.org/docs-2.0/mod/directives.html.
Also, as you make changes to your Apache setup, it is
likely that somewhere along the way a mistake will be made.
Index: ch08.xml
===================================================================
--- ch08.xml (revision 6931)
+++ ch08.xml (working copy)
@@ -61,7 +61,7 @@
you want to use an external diff program, use
. You can pass switches to the
diff program with the
- switch (More on that later in this section).
+ switch (more on that later in this section).
@@ -135,7 +135,7 @@
you from doing in normal usage, but you can pass the
force switch to tell Subversion I know what I'm
doing as well as the possible repercussions of doing it,
- so let me at 'em.. This switch is the
+ so let me at 'em. This switch is the
programmatic equivalent of doing your own electrical
work with the power on—if you don't know what
you're doing, you're likely to get a nasty shock.
@@ -948,7 +948,7 @@
Copy an item from the repository to your working
- copy (Just schedules the copy—nothing goes into the
+ copy (just schedules the copy—nothing goes into the
repository until you commit):
@@ -1187,7 +1187,7 @@
Examples
- Compare BASE and your working copy (One of the most
+ Compare BASE and your working copy (one of the most
popular uses of svn diff):
@@ -2071,7 +2071,7 @@
working copy or in the repository.
- This command is equivalent to a svn
+ This command is equivalent to an svn
copy followed by svn
delete.
@@ -2912,7 +2912,7 @@
The fifth column is populated only if the item is
- switched relative to its parent (See ).
@@ -3015,7 +3015,7 @@
If you want to find out what files in your working
copy are out-of-date, pass the
- switch (This will
+ switch (this will
not make any changes to your
working copy). Here you can see that
wc/foo.c has changed in the
@@ -3251,7 +3251,7 @@
You can also update your working copy to an older
revision (Subversion doesn't have the concept of
- sticky files like CVS does. See sticky files like CVS does; see ):
@@ -3609,7 +3609,7 @@
in which PATH was modified. Use the COPIES flag to allow
this operation to cross copy history while searching for
revisions. PATH must exist in the HEAD of the
- repository).
+ repository.
Index: glossary.xml
===================================================================
--- glossary.xml (revision 6931)
+++ glossary.xml (working copy)
@@ -9,7 +9,7 @@
Add
- A svn command that is used to add a
+ An svn command that is used to add a
file or directory to a repository.