Index: ch01-fundamental-concepts.xml
===================================================================
--- ch01-fundamental-concepts.xml (Revision 3110)
+++ ch01-fundamental-concepts.xml (Arbeitskopie)
@@ -454,10 +454,10 @@
Checked out revision 56.
$ ls -A calc
-Makefile integer.c button.c .svn/
+.svn Makefile button.c integer.c
- The list of letter As in the left margin indicates that
+ The list of letter As in the left margin indicates that
Subversion is adding a number of items to your working copy.
You now have a personal copy of the
repository's /calc directory, with one
@@ -509,7 +509,7 @@
/home/sally/calc
$ ls -A
-.svn/ Makefile integer.c button.c
+.svn Makefile button.c integer.c
$ svn update
U button.c
Index: ch02-basic-usage.xml
===================================================================
--- ch02-basic-usage.xml (Revision 3110)
+++ ch02-basic-usage.xml (Arbeitskopie)
@@ -49,8 +49,8 @@
Valid options:
-q [--quiet] : print nothing, or only summary information
-N [--non-recursive] : obsolete; try --depth=files or --depth=immediates
- --depth ARG : pass depth ('empty', 'files', 'immediates', or
- 'infinity') as ARG
+ --depth ARG : limit operation by depth ARG ('empty', 'files',
+ 'immediates', or 'infinity')
…
@@ -240,12 +240,12 @@
$ svn checkout \
http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline/
A cmdline/revert_tests.py
-A cmdline/diff_tests.py
-A cmdline/autoprop_tests.py
-A cmdline/xmltests
-A cmdline/xmltests/svn-test.sh
+A cmdline/cat_tests.py
+A cmdline/svneditor.bat
+A cmdline/import_tests.py
+A cmdline/mergeinfo_tests.py
…
-Checked out revision 8810.
+Checked out revision 31632.
Since Subversion uses a copy-modify-merge
@@ -307,7 +307,7 @@
A subv/ac-helpers/install-sh
A subv/build.conf
…
-Checked out revision 8810.
+Checked out revision 31632.
That will place your working copy in a directory named
@@ -322,6 +322,7 @@
When you perform a Subversion operation that requires you
to authenticate, by default Subversion caches your
+ ### also for svn+ssh://??
authentication credentials on disk. This is done for
convenience, so that you don't have to continually re-enter
your password for future operations. If you're concerned
@@ -468,6 +469,7 @@
Updated to revision 2.
+ ### remove "else", the same person could have committed in a different wc
In this case, someone else checked in modifications to
both foo.c and bar.c
since the last time you updated, and Subversion has updated
@@ -477,7 +479,7 @@
svn update, a letter code is displayed next
to each item to let you know what actions Subversion performed
to bring your working copy up-to-date. To find out what these
- letters mean, see svn update.
+ letters mean, see svn help update.
@@ -553,6 +555,7 @@
underneath foo will be scheduled
for addition. If you want only to add
foo itself, pass the
+ ### that's obsolet ...
()
option.
@@ -643,7 +646,7 @@
sort of staging area to set up your changes
before committing them to the repository. Commands that
operate on URLs don't have this luxury, so when you operate
- directly on a URL, any of the above actions represent an
+ directly on a URL, any of the above actions represents an
immediate commit.
@@ -672,7 +675,8 @@
The commands svn status,
svn diff, and svn
- revert can be used without any network access even
+ ### svn status -u and svn revert deleted_dir require net access
+ revert can normally be used without any network access even
if your repository is across the
network. This makes it easy to manage your
changes-in-progress when you are somewhere without a network
@@ -708,7 +712,7 @@
controlled file within the .svn area.
Because of this, Subversion can quickly show you how your
working files have changed or even allow you to undo your
- changes without contacting the repository.
+ changes on files without contacting the repository.
@@ -773,6 +777,7 @@
+ ### embed item also in tags!
C item
@@ -866,7 +871,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.)
svn status can display much more
information about the files and directories in your
@@ -1011,7 +1016,8 @@
svn revert
- ITEM has exactly the same
+ ### wrong! See example above (svn add foo)
+ ITEM has exactly the same
effect as deleting ITEM from
your working copy and then running svn update -r
BASEITEM. However,
@@ -1026,7 +1032,6 @@
$ svn status README
- README
$ svn delete README
D README
@@ -1035,7 +1040,6 @@
Reverted 'README'
$ svn status README
- README
@@ -1053,7 +1057,8 @@
U INSTALL
G README
Conflict discovered in 'bar.c'.
-Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options:
+Select: (p) postpone, (df) diff-full, (e) edit,
+ (h) help for more options:
The U and
@@ -1121,7 +1126,8 @@
Open the file in conflict with your favorite editor,
as set in the environment variable
- EDITOR.
+ EDITOR or via editor-cmd =
+ in Subversion's config file ~/.subversion/config.
@@ -1141,7 +1147,7 @@
- (m)ine
+ (m)ine-(f)ullDiscard the newly received changes from the server
@@ -1151,7 +1157,7 @@
- (t)heirs
+ (t)heirs-(f)ullDiscard your local changes to the file under review
@@ -1200,8 +1206,9 @@
…
-Select: (p) postpone, (df) diff-full, (e) edit, (h)elp for more options : d
---- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007
+Select: (p) postpone, (df) diff-full, (e) edit,
+ (h) help for more options: df
+--- /tmp/tmp.3 Tue Dec 11 21:33:57 2007
+++ .svn/tmp/tempfile.32.tmp Tue Dec 11 21:34:33 2007
@@ -1 +1,5 @@
-Just buy a sandwich.
@@ -1237,6 +1244,7 @@
changes, you can use the edit command
(e) to manually edit the file with
conflict markers in a text editor (determined by the
+ ### or editor-cmd
EDITOR environment variable). Editing
the file by hand in your favorite text editor is a somewhat
low-tech way of remedying conflicts (see for more details).
Subversion will pass four arguments to the merge tool: The
BASE revision of the file, the revision
+
of the file received from the server as part of the update,
the copy of the file containing your local edits, and
lastly, the merged copy of the file (which contains conflict
@@ -1268,9 +1279,9 @@
If you decide that you don't need to merge any changes,
but just want to accept one version of the file or the
other, you can either choose your changes (aka
- mine) by using the mine
- command (m) or choose theirs by using the
- theirs command (t).
+ mine) by using the mine-full ### mine-full cannot be entered!
+ option (mf) or choose theirs by using the
+ theirs-full command (tf).
@@ -1342,7 +1353,7 @@
- filename.rOLDREV
+ filename.rOLDREVThis is the file that was the
BASE revision before you updated
@@ -1353,11 +1364,12 @@
- filename.rNEWREV
+ filename.rNEWREVThis is the file that your Subversion client
just received from the server when you updated your
working copy. This file corresponds to the
+ ### if -r is not specified ...
HEAD revision of the
repository.
@@ -1365,9 +1377,9 @@
- Here OLDREV is the revision number
+ Here OLDREV is the revision number
of the file in your .svn directory,
- and NEWREV is the revision number of
+ and NEWREV is the revision number of
the repository HEAD.
@@ -1382,7 +1394,8 @@
$ svn update
Conflict discovered in 'sandwich.txt'.
-Select: (p) postpone, (df) diff-full, (e) edit, (h)elp for more options : p
+Select: (p) postpone, (df) diff-full, (e) edit,
+ (h) help for more options: p
C sandwich.txt
Updated to revision 2.
$ ls -1