[svnbook] r4065 committed - Finish issue #138 ("1.7 change: error and warning number codes now...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Sep 6 16:03:04 CDT 2011
Revision: 4065
Author: cmpilato at gmail.com
Date: Tue Sep 6 14:02:35 2011
Log: Finish issue #138 ("1.7 change: error and warning number codes now
reported").
* en/book/ch02-basic-usage.xml,
* en/book/ch03-advanced-topics.xml,
* en/book/ch07-customizing-svn.xml,
* en/book/ch09-reference.xml
Retroactively discover and insert error codes into error messages
and warnings (updating error messages which have changed).
http://code.google.com/p/svnbook/source/detail?r=4065
Modified:
/trunk/en/book/ch02-basic-usage.xml
/trunk/en/book/ch03-advanced-topics.xml
/trunk/en/book/ch07-customizing-svn.xml
/trunk/en/book/ch09-reference.xml
=======================================
--- /trunk/en/book/ch02-basic-usage.xml Tue Sep 6 08:36:29 2011
+++ /trunk/en/book/ch02-basic-usage.xml Tue Sep 6 14:02:35 2011
@@ -1716,8 +1716,8 @@
<informalexample>
<screen>
$ svn commit -m "Add a few more things"
-svn: Commit failed (details follow):
-svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in
conflict
+svn: E155015: Commit failed (details follow):
+svn: E155015: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains
in conflict
</screen>
</informalexample>
@@ -2033,8 +2033,8 @@
<screen>
$ svn commit -m "Add another rule"
Sending rules.txt
-svn: Commit failed (details follow):
-svn: File '/sandwich.txt' is out of date
+svn: E155011: Commit failed (details follow):
+svn: E155011: File '/home/sally/svn-work/sandwich.txt' is out of date
…
</screen>
</informalexample>
=======================================
--- /trunk/en/book/ch03-advanced-topics.xml Tue Sep 6 09:12:03 2011
+++ /trunk/en/book/ch03-advanced-topics.xml Tue Sep 6 14:02:35 2011
@@ -547,7 +547,7 @@
<informalexample>
<screen>
$ svn cat -r 1 concept/IDEA
-svn: Unable to find repository location for 'concept/IDEA' in revision 1
+svn: E195012: Unable to find repository location for 'concept/IDEA' in
revision 1
</screen>
</informalexample>
@@ -559,8 +559,8 @@
<informalexample>
<screen>
-$ svn cat -r 1 concept/IDEA at BASE
-svn: Unable to find repository location for 'concept/IDEA' in revision 1
+$ svn cat -r 1 concept/IDEA at BASEs
+svn: E195012: Unable to find repository location for 'concept/IDEA' in
revision 1
</screen>
</informalexample>
@@ -3103,10 +3103,10 @@
D banana.jpg
$ svn commit -m "Delete useless file."
Deleting banana.jpg
-svn: Commit failed (details follow):
-svn: Server sent unexpected return value (423 Locked) in response to
DELETE\
- request
for '/repos/project/!svn/wrk/64bad3a9-96f9-0310-818a-df4224ddc35d/\
-banana.jpg'
+svn: E175002: Commit failed (details follow):
+svn: E175002: Server sent unexpected return value (423 Locked) in response
to
+DELETE request
for '/repos/project/!svn/wrk/64bad3a9-96f9-0310-818a-df4224ddc
+35d/banana.jpg'
$
</screen>
</informalexample>
@@ -3299,11 +3299,11 @@
* 72 foo.h
Status against revision: 105
$ svn unlock raisin.jpg
-svn: 'raisin.jpg' is not locked in this working copy
+svn: E195013: 'raisin.jpg' is not locked in this working copy
$ svn info raisin.jpg | grep URL
URL: http://svn.example.com/repos/project/raisin.jpg
$ svn unlock http://svn.example.com/repos/project/raisin.jpg
-svn: Unlock request failed: 403 Forbidden (http://svn.example.com)
+svn: warning: W160039: Unlock failed on 'raisin.jpg' (403 Forbidden)
$ svn unlock --force http://svn.example.com/repos/project/raisin.jpg
'raisin.jpg' unlocked.
$
@@ -3336,7 +3336,8 @@
<informalexample>
<screen>
$ svn lock raisin.jpg
-svn: Lock request failed: 423 Locked (http://svn.example.com)
+svn: warning: W160035: Path '/project/raisin.jpg' is already locked by
user 'h
+arry' in filesystem '/var/svn/repos/db'
$ svn lock --force raisin.jpg
'raisin.jpg' locked by user 'sally'.
$
@@ -3460,7 +3461,8 @@
$ ls -l raisin.jpg
-r--r--r-- 1 sally sally 215589 Jun 8 19:23 raisin.jpg
$ svn lock raisin.jpg
-svn: Lock request failed: 423 Locked (http://svn.example.com)
+svn: warning: W160035: Path '/project/raisin.jpg' is already locked by
user 'h
+arry' in filesystem '/var/svn/repos/db'
$ svn info http://svn.example.com/repos/project/raisin.jpg | grep Lock
Lock Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b
Lock Owner: harry
@@ -3713,8 +3715,12 @@
$ svn update
Updating '.':
-Fetching external item into 'renamed-project/some-dir/subdir'
-svn: Target path does not exist
+svn: warning: W200000: Error handling externals definition
for 'renamed-projec
+t/some-dir/subdir':
+svn: warning: W170000:
URL 'http://svn.example.com/projects/my-project/externa
+l-dir' at revision 12 doesn't exist
+At revision 12.
+svn: E205011: Failure occurred processing one or more externals definitions
$
</screen>
</informalexample>
@@ -3891,8 +3897,8 @@
M X www/green.html
$ svn commit -m "change the color" www/green.html
Sending www/green.html
-svn: Commit failed (details follow):
-svn: File '/trunk/bikeshed/blue.html' is out of date
+svn: E155011: Commit failed (details follow):
+svn: E155011: File '/trunk/bikeshed/blue.html' is out of date
$
</screen>
</informalexample>
=======================================
--- /trunk/en/book/ch07-customizing-svn.xml Wed Aug 17 10:05:11 2011
+++ /trunk/en/book/ch07-customizing-svn.xml Tue Sep 6 14:02:35 2011
@@ -1093,9 +1093,9 @@
<informalexample>
<screen>
-svn: Can't convert string from native encoding to 'UTF-8':
+svn: E000022: Can't convert string from native encoding to 'UTF-8':
…
-svn: Can't convert string from 'UTF-8' to native encoding:
+svn: E000022: Can't convert string from 'UTF-8' to native encoding:
…
</screen>
</informalexample>
=======================================
--- /trunk/en/book/ch09-reference.xml Tue Sep 6 11:23:20 2011
+++ /trunk/en/book/ch09-reference.xml Tue Sep 6 14:02:35 2011
@@ -1352,13 +1352,11 @@
A mine/a
A mine/b
^C
-svn: The operation was interrupted
-svn: caught SIGINT
+svn: E200015: Caught signal
$ svn checkout file:///var/svn/repos/test mine
A mine/c
^C
-svn: The operation was interrupted
-svn: caught SIGINT
+svn: E200015: Caught signal
$ svn update mine
Updating 'mine':
A mine/d
@@ -1381,13 +1379,16 @@
</screen>
</informalexample>
- <para>Subversion will complain by default if you try to
- check out a directory atop an existing directory which
- contains files or subdirectories that the checkout itself
- would have created. Use the <option>--force</option>
- option to override this safeguard. When you check out
- with the <option>--force</option> option, any unversioned
- file in the checkout target tree which ordinarily would
+ <para>Prior to version 1.7, Subversion would complain by
+ default if you try to check out a directory atop an
+ existing directory which contains files or subdirectories
+ that the checkout itself would have created. Subversion
+ 1.7 handles this situation differently, allowing the
+ checkout to proceed but marking any obstructing objects as
+ tree conflicts. Use the <option>--force</option> option
+ to override this safeguard. When you check out with
+ the <option>--force</option> option, any unversioned file
+ in the checkout target tree which ordinarily would
obstruct the checkout will still become versioned, but
Subversion will preserve its contents as-is. If those
contents differ from the repository file at that path
@@ -1402,9 +1403,6 @@
$ mkdir project
$ mkdir project/lib
$ touch project/lib/file.c
-$ svn checkout file:///var/svn/repos/project/trunk project
-svn: Failed to add directory 'project/lib': an unversioned directory of
the sa
-me name already exists
$ svn checkout file:///var/svn/repos/project/trunk project --force
E project/lib
A project/lib/subdir
@@ -1647,8 +1645,7 @@
<informalexample>
<screen>
$ svn commit -F file_under_vc.txt foo.c
-svn: The log message file is under version control
-svn: Log message file is a versioned file; use '--force-log' to override
+svn: E205004: Log message file is a versioned file; use '--force-log' to
override
$ svn commit --force-log -F file_under_vc.txt foo.c
Sending foo.c
@@ -1976,12 +1973,13 @@
<informalexample>
<screen>
$ svn delete over-there
-svn: Attempting restricted operation for modified resource
-svn: Use --force to override this restriction
-svn: 'over-there' has local modifications
-
+svn: E195006: Use --force to override this restriction (local
modifications ma
+y be lost)
+svn: E195006: '/home/sally/project/over-there' has local modifications --
comm
+it or revert them first
$ svn delete --force over-there
D over-there
+$
</screen>
</informalexample>
@@ -2953,9 +2951,8 @@
<informalexample>
<screen>
$ svn lock tree.jpg
-svn: warning: Path '/tree.jpg is already locked by user 'sally in \
- filesystem '/var/svn/repos/db'
-
+svn: warning: W160035: Path '/tree.jpg is already locked by user 'sally'
in fi
+lesystem '/var/svn/repos/db'
$ svn lock --force tree.jpg
'tree.jpg' locked by user 'harry'.
</screen>
@@ -5771,7 +5768,7 @@
<informalexample>
<screen>
$ svn unlock tree.jpg
-svn: 'tree.jpg' is not locked in this working copy
+svn: E195013: 'tree.jpg' is not locked in this working copy
$ svn unlock --force tree.jpg
'tree.jpg' unlocked.
</screen>
@@ -6055,8 +6052,8 @@
<screen>
$ svn status
svn: E155036: Please see the 'svn upgrade' command
-svn: E155036: Working copy '/home/cmpilato/tests/wc' is too old (format
10, cr
-eated by Subversion 1.6)
+svn: E155036: Working copy '/home/sally/project' is too old (format 10,
create
+d by Subversion 1.6)
$
</screen>
</informalexample>
@@ -7074,9 +7071,8 @@
<informalexample>
<screen>
$ svnadmin recover /var/svn/repos
-svn: Failed to get exclusive repository access; perhaps another process
-such as httpd, svnserve or svn has it open?
-
+svn: E165000: Failed to get exclusive repository access; perhaps another
proce
+ss such as httpd, svnserve or svn has it open?
$
</screen>
</informalexample>
More information about the svnbook-dev
mailing list