[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Nice to have for 1.0; Error messages cf most important conventions

From: Erik Hülsmann <e.huelsmann_at_gmx.net>
Date: 2003-12-16 18:10:11 CET
('binary' encoding is not supported, stored as-is) I finally did it! I found a way to tick of both Greg Stein and Karl:
a patch touching nearly 90 files in the repository.

Fortunately it does not contain changes in functionality. Only improved
user experience: it forces the 3 major error message conventions on the
remaining error messages.

I would *really* like to have this in 1.0 for better user experience.

The patch below is especially

Log:
[[[
Quick fixup of error messages; apply 3 most important conventions and
remove function and parameter names from error messages.

Applied changes:
  Remove trailing '.'
  Capitalize first letter
  Change "" to '' when quoting information
  Remove function names from error messages
  Eliminate parameter name in error message here and there

* subversion/tests/clients/cmdline/commit_tests.py
* subversion/tests/clients/cmdline/switch_tests.py
  Adjust to match new output

]]]

Index: subversion/svnadmin/main.c
===================================================================
--- subversion/svnadmin/main.c (revision 8012)
+++ subversion/svnadmin/main.c (working copy)
@@ -46,7 +46,7 @@
   apr_status_t apr_err = open_fn (&stdio_file, pool);
 
   if (apr_err)
- return svn_error_wrap_apr (apr_err, "Can't opening stdio file");
+ return svn_error_wrap_apr (apr_err, "Can't open stdio file");
   
   *stream = svn_stream_from_aprfile (stdio_file, pool);
   return SVN_NO_ERROR;
@@ -74,7 +74,7 @@
   if (*repos_path == NULL)
     {
       return svn_error_create (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "repository argument required");
+ "Repository argument required");
     }
   else if (svn_path_is_url (*repos_path))
     {
@@ -359,11 +359,11 @@
   if (start > end)
     return svn_error_create
       (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "first revision cannot be higher than second");
+ "First revision cannot be higher than second");
   if ((start > youngest) || (end > youngest))
     return svn_error_createf
       (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "revisions must not be greater than the youngest revision (%"
+ "Revisions must not be greater than the youngest revision (%"
        SVN_REVNUM_T_FMT ")", youngest);
 
   /* Loop over the requested revision range, performing the
@@ -426,11 +426,11 @@
   if (lower > upper)
     return svn_error_create
       (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "first revision cannot be higher than second");
+ "First revision cannot be higher than second");
   if ((lower > youngest) || (upper > youngest))
     return svn_error_createf
       (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "revisions must not be greater than the youngest revision (%"
+ "Revisions must not be greater than the youngest revision (%"
        SVN_REVNUM_T_FMT ")", youngest);
 
   /* Run the dump to STDOUT. Let the user redirect output into
@@ -672,16 +672,16 @@
 
   if (opt_state->start_revision.kind != svn_opt_revision_number)
     return svn_error_createf (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "missing revision");
+ "Missing revision");
   else if (opt_state->end_revision.kind != svn_opt_revision_unspecified)
     return svn_error_createf (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "only one revision allowed");
+ "Only one revision allowed");
     
   SVN_ERR (svn_opt_parse_all_args (&args, os, pool));
 
   if (args->nelts != 1)
     return svn_error_createf (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "exactly one file argument required");
+ "Exactly one file argument required");
   
   SVN_ERR (svn_utf_cstring_to_utf8 (&filename_utf8,
                                     APR_ARRAY_IDX (args, 0, const char *),
Index: subversion/libsvn_ra/ra_loader.c
===================================================================
--- subversion/libsvn_ra/ra_loader.c (revision 8012)
+++ subversion/libsvn_ra/ra_loader.c (working copy)
@@ -121,7 +121,7 @@
     status = apr_dso_sym (&symbol, dso, funcname);
     if (status)
       {
- return svn_error_wrap_apr (status, "\"%s\" does not define \"%s()\"",
+ return svn_error_wrap_apr (status, "'%s' does not define '%s()'",
                                    libname, funcname);
       }
 
@@ -208,7 +208,7 @@
   /* Couldn't find a match... */
   *library = NULL;
   return svn_error_createf (SVN_ERR_RA_ILLEGAL_URL, NULL,
- "Unrecognized URL scheme: \"%s\"", URL);
+ "Unrecognized URL scheme '%s'", URL);
 }
 
 
Index: subversion/libsvn_fs/tree.c
===================================================================
--- subversion/libsvn_fs/tree.c (revision 8012)
+++ subversion/libsvn_fs/tree.c (working copy)
@@ -444,13 +444,13 @@
     return
       svn_error_createf
       (SVN_ERR_FS_NOT_FOUND, 0,
- "file not found: transaction '%s', path '%s'",
+ "File not found: transaction '%s', path '%s'",
        root->txn, path);
   else if (root->kind == revision_root)
     return
       svn_error_createf
       (SVN_ERR_FS_NOT_FOUND, 0,
- "file not found: revision '%" SVN_REVNUM_T_FMT "', path '%s'",
+ "File not found: revision '%" SVN_REVNUM_T_FMT "', path '%s'",
        root->rev, path);
   else
     abort ();
@@ -467,13 +467,13 @@
     return
       svn_error_createf
       (SVN_ERR_FS_ALREADY_EXISTS, 0,
- "file already exists: filesystem '%s', transaction '%s', path '%s'",
+ "File already exists: filesystem '%s', transaction '%s', path '%s'",
        fs->path, root->txn, path);
   else if (root->kind == revision_root)
     return
       svn_error_createf
       (SVN_ERR_FS_ALREADY_EXISTS, 0,
- "file already exists: filesystem '%s', revision '%" SVN_REVNUM_T_FMT
+ "File already exists: filesystem '%s', revision '%" SVN_REVNUM_T_FMT
        "', path '%s'", fs->path, root->rev, path);
   else
     abort ();
@@ -485,7 +485,7 @@
 {
   return svn_error_create
     (SVN_ERR_FS_NOT_TXN_ROOT, NULL,
- "root object must be a transaction root");
+ "Root object must be a transaction root");
 }
 
 
@@ -1513,7 +1513,7 @@
   if ((svn_fs_root_fs (root1)) != (svn_fs_root_fs (root2)))
     return svn_error_create
       (SVN_ERR_FS_GENERAL, NULL,
- "Asking props changed in two different filesystems.");
+ "Asking props changed in two different filesystems");
   
   args.root1 = root1;
   args.root2 = root2;
@@ -1821,7 +1821,7 @@
   if (strcmp (svn_fs__id_txn_id (target_id), txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
- "unexpected immutable node at \"%s\"", target_path);
+ "Unexpected immutable node at '%s'", target_path);
   SVN_ERR (svn_fs__bdb_get_node_revision (&noderev, fs, target_id, trail));
   noderev->predecessor_id = source_id;
   noderev->predecessor_count = source_pred_count;
@@ -1870,7 +1870,7 @@
          as we expected it to be in the changes table. */
       return svn_error_createf
         (SVN_ERR_FS_CORRUPT, NULL,
- "undelete_change: no deletion changes for path '%s' "
+ "No deletion changes for path '%s' "
          "in transaction '%s' of filesystem '%s'",
          path, txn_id, fs->path);
     }
@@ -1889,7 +1889,7 @@
 {
   svn_stringbuf_set (conflict_path, path);
   return svn_error_createf (SVN_ERR_FS_CONFLICT, NULL,
- "conflict at \"%s\"", path);
+ "Conflict at '%s'", path);
 }
 
 
@@ -1936,7 +1936,7 @@
     {
       return svn_error_create
         (SVN_ERR_FS_CORRUPT, NULL,
- "Bad merge -- ancestor, source, and target not all in same fs");
+ "Bad merge; ancestor, source, and target not all in same fs");
     }
 
   /* We have the same fs, now check it. */
@@ -1952,7 +1952,7 @@
       svn_string_t *id_str = svn_fs_unparse_id (target_id, trail->pool);
       return svn_error_createf
         (SVN_ERR_FS_GENERAL, NULL,
- "Bad merge call -- target '%s' has id '%s', same as ancestor.",
+ "Bad merge; target '%s' has id '%s', same as ancestor",
          target_path, id_str->data);
     }
 
@@ -2201,7 +2201,7 @@
                   if (! svn_fs__dag_check_mutable (target, txn_id))
                     return svn_error_createf
                       (SVN_ERR_FS_NOT_MUTABLE, NULL,
- "unexpected immutable node at \"%s\"", target_path);
+ "Unexpected immutable node at '%s'", target_path);
 
                   SVN_ERR (svn_fs__dag_set_entry
                            (target, t_entry->name, s_entry->id,
@@ -2289,7 +2289,7 @@
               if (! svn_fs__dag_check_mutable (target, txn_id))
                 return svn_error_createf
                   (SVN_ERR_FS_NOT_MUTABLE, NULL,
- "unexpected immutable node at \"%s\"", target_path);
+ "Unexpected immutable node at '%s'", target_path);
               
               SVN_ERR (svn_fs__dag_delete (target, t_entry->name,
                                            txn_id, trail));
@@ -2383,7 +2383,7 @@
           if (! svn_fs__dag_check_mutable (target, txn_id))
             return svn_error_createf
               (SVN_ERR_FS_NOT_MUTABLE, NULL,
- "unexpected immutable node at \"%s\"", target_path);
+ "Unexpected immutable node at '%s'", target_path);
               
           SVN_ERR (svn_fs__dag_set_entry
                    (target, s_entry->name, s_entry->id, txn_id, trail));
@@ -2551,7 +2551,7 @@
       svn_string_t *id_str = svn_fs_unparse_id (y_rev_root_id, trail->pool);
       return svn_error_createf
         (SVN_ERR_FS_TXN_OUT_OF_DATE, NULL,
- "transaction '%s' out of date with respect to revision '%s'",
+ "Transaction '%s' out of date with respect to revision '%s'",
          txn_name, id_str->data);
     }
   
@@ -2726,7 +2726,7 @@
     {
       return svn_error_create
         (SVN_ERR_FS_CORRUPT, NULL,
- "Bad merge -- ancestor, source, and target not all in same fs");
+ "Bad merge; ancestor, source, and target not all in same fs");
     }
 
   /* ### kff todo: is there any compelling reason to get the nodes in
@@ -2971,7 +2971,7 @@
   /* We can't remove the root of the filesystem. */
   if (! parent_path->parent)
     return svn_error_create (SVN_ERR_FS_ROOT_DIR, NULL,
- "the root directory cannot be deleted");
+ "The root directory cannot be deleted");
 
   /* Make the parent directory mutable, and do the deletion. */
   SVN_ERR (make_path_mutable (root, parent_path->parent, path, trail));
@@ -3026,7 +3026,7 @@
 
   if (! svn_fs_is_revision_root (from_root))
     return svn_error_create (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "copy from mutable tree not currently supported");
+ "Copy from mutable tree not currently supported");
 
   /* Get the NODE for FROM_PATH in FROM_ROOT.*/
   SVN_ERR (get_dag (&from_node, from_root, from_path, trail));
@@ -3579,7 +3579,7 @@
         return svn_error_createf
           (SVN_ERR_CHECKSUM_MISMATCH,
            NULL,
- "txn_body_apply_textdelta: base checksum mismatch on \"%s\":\n"
+ "Base checksum mismatch on '%s':\n"
            " expected: %s\n"
            " actual: %s\n",
            tb->path, tb->base_checksum, hex);
@@ -3826,7 +3826,7 @@
   if ((svn_fs_root_fs (root1)) != (svn_fs_root_fs (root2)))
     return svn_error_create
       (SVN_ERR_FS_GENERAL, NULL,
- "Asking contents changed in two different filesystems.");
+ "Asking contents changed in two different filesystems");
   
   /* Check that both paths are files. */
   {
@@ -3835,12 +3835,12 @@
     SVN_ERR (svn_fs_is_file (&is_file, root1, path1, pool));
     if (! is_file)
       return svn_error_createf
- (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file.", path1);
+ (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path1);
       
     SVN_ERR (svn_fs_is_file (&is_file, root2, path2, pool));
     if (! is_file)
       return svn_error_createf
- (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file.", path2);
+ (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path2);
   }
 
   args.root1 = root1;
Index: subversion/libsvn_fs/reps-strings.c
===================================================================
--- subversion/libsvn_fs/reps-strings.c (revision 8012)
+++ subversion/libsvn_fs/reps-strings.c (working copy)
@@ -99,7 +99,7 @@
   if (rep->kind != svn_fs__rep_kind_delta)
     return svn_error_create
       (SVN_ERR_FS_GENERAL, NULL,
- "delta_string_key: representation is not of type 'delta'");
+ "Representation is not of type 'delta'");
 
   /* Set up a convenience variable. */
   chunks = rep->contents.delta.chunks;
@@ -470,7 +470,7 @@
               if (first_chunk->version != chunk->version)
                 return svn_error_createf
                   (SVN_ERR_FS_CORRUPT, NULL,
- "diff version inconsistencies in representation '%s'",
+ "Diff version inconsistencies in representation '%s'",
                    rep_key);
 
               rep_key = chunk->rep_key;
@@ -725,7 +725,7 @@
   if (contents_size > SVN_MAX_OBJECT_SIZE)
     return svn_error_createf
       (SVN_ERR_FS_GENERAL, NULL,
- "svn_fs__rep_contents: rep contents are too large "
+ "Rep contents are too large "
        "(got %" SVN_FILESIZE_T_FMT ", limit is %" APR_SIZE_T_FMT ")",
        contents_size, SVN_MAX_OBJECT_SIZE);
   else
@@ -740,7 +740,7 @@
   if (len != str->len)
     return svn_error_createf
       (SVN_ERR_FS_CORRUPT, NULL,
- "svn_fs__rep_contents: failure reading rep \"%s\"", rep_key);
+ "Failure reading rep '%s'", rep_key);
 
   /* Just the standard paranoia. */
   {
@@ -756,7 +756,7 @@
     if (! svn_md5_digests_match (checksum, rep->checksum))
       return svn_error_createf
         (SVN_ERR_FS_CORRUPT, NULL,
- "svn_fs__rep_contents: checksum mismatch on rep \"%s\":\n"
+ "Checksum mismatch on rep '%s':\n"
          " expected: %s\n"
          " actual: %s\n", rep_key,
          svn_md5_digest_to_cstring (rep->checksum, trail->pool),
@@ -840,7 +840,7 @@
               if (! svn_md5_digests_match (checksum, rep->checksum))
                 return svn_error_createf
                   (SVN_ERR_FS_CORRUPT, NULL,
- "txn_body_read_rep: checksum mismatch on rep \"%s\":\n"
+ "Checksum mismatch on rep '%s':\n"
                    " expected: %s\n"
                    " actual: %s\n", args->rb->rep_key,
                    svn_md5_digest_to_cstring (rep->checksum, trail->pool),
@@ -853,7 +853,7 @@
       return
         svn_error_create
         (SVN_ERR_FS_REP_CHANGED, NULL,
- "txn_body_read_rep: null rep, but offset past zero already");
+ "Null rep, but offset past zero already");
     }
   else
     *(args->len) = 0;
@@ -965,7 +965,7 @@
   if (! rep_is_mutable (rep, txn_id))
     svn_error_createf
       (SVN_ERR_FS_REP_NOT_MUTABLE, NULL,
- "rep_write: rep \"%s\" is not mutable", rep_key);
+ "Rep '%s' is not mutable", rep_key);
 
   if (rep->kind == svn_fs__rep_kind_fulltext)
     {
@@ -979,7 +979,7 @@
          in this file, and it creates them fulltext. */
       return svn_error_createf
         (SVN_ERR_FS_CORRUPT, NULL,
- "rep_write: rep \"%s\" both mutable and non-fulltext", rep_key);
+ "Rep '%s' both mutable and non-fulltext", rep_key);
     }
   else /* unknown kind */
     abort ();
@@ -1156,7 +1156,7 @@
   if (! rep_is_mutable (rep, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_REP_NOT_MUTABLE, NULL,
- "svn_fs__rep_contents_clear: rep \"%s\" is not mutable", rep_key);
+ "Rep '%s' is not mutable", rep_key);
 
   assert (rep->kind == svn_fs__rep_kind_fulltext);
 
@@ -1275,7 +1275,7 @@
   /* Make sure we (still) have a key. */
   if (wb->key == NULL)
     return svn_error_create (SVN_ERR_FS_GENERAL, NULL,
- "write_string_set: Failed to get new string key");
+ "Failed to get new string key");
 
   /* Restore *LEN to the value it *would* have been were it not for
      header stripping. */
@@ -1350,7 +1350,7 @@
   if (strcmp (target, source) == 0)
     return svn_error_createf
       (SVN_ERR_FS_CORRUPT, NULL,
- "svn_fs__rep_deltify: attempt to deltify \"%s\" against itself",
+ "Attempt to deltify '%s' against itself",
        target);
 
   /* Set up a handler for the svndiff data, which will write each
@@ -1416,7 +1416,7 @@
   if (! digest)
     return svn_error_createf
       (SVN_ERR_DELTA_MD5_CHECKSUM_ABSENT, NULL,
- "svn_fs__rep_deltify: failed to calculate MD5 digest for '%s'",
+ "Failed to calculate MD5 digest for '%s'",
        source);
 
   /* Construct a list of the strings used by the old representation so
Index: subversion/libsvn_fs/bdb/reps-table.c
===================================================================
--- subversion/libsvn_fs/bdb/reps-table.c (revision 8012)
+++ subversion/libsvn_fs/bdb/reps-table.c (working copy)
@@ -89,7 +89,7 @@
   if (db_err == DB_NOTFOUND)
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_REPRESENTATION, 0,
- "svn_fs__bdb_read_rep: no such representation '%s'", key);
+ "No such representation '%s'", key);
 
   /* Handle any other error conditions. */
   SVN_ERR (BDB_WRAP (fs, "reading representation", db_err));
@@ -189,7 +189,7 @@
   if (db_err == DB_NOTFOUND)
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_REPRESENTATION, 0,
- "svn_fs__bdb_delete_rep: no such representation '%s'", key);
+ "No such representation '%s'", key);
 
   /* Handle any other error conditions. */
   SVN_ERR (BDB_WRAP (fs, "deleting representation", db_err));
Index: subversion/libsvn_fs/bdb/strings-table.c
===================================================================
--- subversion/libsvn_fs/bdb/strings-table.c (revision 8012)
+++ subversion/libsvn_fs/bdb/strings-table.c (working copy)
@@ -101,7 +101,7 @@
       (*cursor)->c_close (*cursor);
       return svn_error_createf
         (SVN_ERR_FS_NO_SUCH_STRING, 0,
- "locate_key: no such string '%s'", (const char *)query->data);
+ "No such string '%s'", (const char *)query->data);
     }
   if (db_err)
     {
@@ -110,7 +110,7 @@
       if (db_err != ENOMEM)
         {
           (*cursor)->c_close (*cursor);
- return BDB_WRAP (fs, "could not move cursor", db_err);
+ return BDB_WRAP (fs, "moving cursor", db_err);
         }
 
       /* We got an ENOMEM (typical since we have a zero length buf), so
@@ -351,7 +351,7 @@
   if (db_err == DB_NOTFOUND)
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_STRING, 0,
- "svn_fs__string_clear: no such string '%s'", key);
+ "No such string '%s'", key);
 
   /* Handle any other error conditions. */
   SVN_ERR (BDB_WRAP (fs, "clearing string", db_err));
@@ -422,7 +422,7 @@
   if (db_err == DB_NOTFOUND)
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_STRING, 0,
- "svn_fs__bdb_delete_string: no such string '%s'", key);
+ "No such string '%s'", key);
 
   /* Handle any other error conditions. */
   SVN_ERR (BDB_WRAP (fs, "deleting string", db_err));
Index: subversion/libsvn_fs/bdb/nodes-table.c
===================================================================
--- subversion/libsvn_fs/bdb/nodes-table.c (revision 8012)
+++ subversion/libsvn_fs/bdb/nodes-table.c (working copy)
@@ -147,7 +147,7 @@
       svn_string_t *new_id_str = svn_fs_unparse_id (new_id, trail->pool);
       return svn_error_createf
         (SVN_ERR_FS_ALREADY_EXISTS, err,
- "successor id '%s' (for '%s') already exists in filesystem '%s'",
+ "Successor id '%s' (for '%s') already exists in filesystem '%s'",
          new_id_str->data, id_str->data, fs->path);
     }
 
Index: subversion/libsvn_fs/bdb/changes-table.c
===================================================================
--- subversion/libsvn_fs/bdb/changes-table.c (revision 8012)
+++ subversion/libsvn_fs/bdb/changes-table.c (working copy)
@@ -150,7 +150,7 @@
       if ((! change->noderev_id) && (change->kind != svn_fs_path_change_reset))
         return svn_error_create
           (SVN_ERR_FS_CORRUPT, NULL,
- "Invalid change: missing required node revision ID");
+ "Missing required node revision ID");
         
       /* Sanity check: we should be talking about the same node
          revision ID as our last change except where the last change
@@ -275,7 +275,7 @@
       if (! result_skel)
         {
           err = svn_error_createf (SVN_ERR_FS_CORRUPT, NULL,
- "error reading changes for key '%s'", key);
+ "Error reading changes for key '%s'", key);
           goto cleanup;
         }
       err = svn_fs__parse_change_skel (&change, result_skel, subpool);
@@ -364,7 +364,7 @@
       if (! result_skel)
         {
           err = svn_error_createf (SVN_ERR_FS_CORRUPT, NULL,
- "error reading changes for key '%s'", key);
+ "Error reading changes for key '%s'", key);
           goto cleanup;
         }
       err = svn_fs__parse_change_skel (&change, result_skel, trail->pool);
Index: subversion/libsvn_fs/fs.c
===================================================================
--- subversion/libsvn_fs/fs.c (revision 8012)
+++ subversion/libsvn_fs/fs.c (working copy)
@@ -65,7 +65,7 @@
       || (major == SVN_FS_WANT_DB_MAJOR && minor == SVN_FS_WANT_DB_MINOR
           && patch < SVN_FS_WANT_DB_PATCH))
     return svn_error_createf (SVN_ERR_FS_GENERAL, 0,
- "bad database version: got %d.%d.%d,"
+ "Bad database version: got %d.%d.%d,"
                               " should be at least %d.%d.%d",
                               major, minor, patch,
                               SVN_FS_WANT_DB_MAJOR,
@@ -76,7 +76,7 @@
      the one we compiled with. */
   if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR)
     return svn_error_createf (SVN_ERR_FS_GENERAL, 0,
- "bad database version:"
+ "Bad database version:"
                               " compiled with %d.%d.%d,"
                               " running against %d.%d.%d",
                               DB_VERSION_MAJOR,
@@ -94,7 +94,7 @@
 {
   if (fs->env)
     return svn_error_create (SVN_ERR_FS_ALREADY_OPEN, 0,
- "filesystem object already open");
+ "Filesystem object already open");
   else
     return SVN_NO_ERROR;
 }
Index: subversion/libsvn_fs/err.c
===================================================================
--- subversion/libsvn_fs/err.c (revision 8012)
+++ subversion/libsvn_fs/err.c (working copy)
@@ -54,7 +54,7 @@
 svn_fs__err_corrupt_node_revision (svn_fs_t *fs, const svn_fs_id_t *id)
 {
   return
- corrupt_id ("corrupt node revision for node '%s' in filesystem '%s'",
+ corrupt_id ("Corrupt node revision for node '%s' in filesystem '%s'",
                 id, fs);
 }
 
@@ -64,7 +64,7 @@
 {
   return svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
- "corrupt filesystem revision '%" SVN_REVNUM_T_FMT "' in filesystem '%s'",
+ "Corrupt filesystem revision '%" SVN_REVNUM_T_FMT "' in filesystem '%s'",
      rev, fs->path);
 }
 
@@ -77,7 +77,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
- "corrupt clone record for '%s' in transaction '%s' in filesystem '%s'",
+ "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'",
      base_path, svn_txn, fs->path);
 }
 
@@ -97,7 +97,7 @@
   svn_string_t *id_str = svn_fs_unparse_id (id, fs->pool);
   return svn_error_createf
     (SVN_ERR_FS_ID_NOT_FOUND, 0,
- "reference to non-existent node '%s' in filesystem '%s'",
+ "Reference to non-existent node '%s' in filesystem '%s'",
      id_str->data, fs->path);
 }
 
@@ -107,7 +107,7 @@
 {
   return svn_error_createf
     (SVN_ERR_FS_NO_SUCH_REVISION, 0,
- "reference to non-existent revision '%"
+ "Reference to non-existent revision '%"
      SVN_REVNUM_T_FMT
      "' in filesystem '%s'",
      rev, fs->path);
@@ -120,7 +120,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
- "malformed ID as key in 'nodes' table of filesystem '%s'", fs->path);
+ "Malformed ID as key in 'nodes' table of filesystem '%s'", fs->path);
 }
 
 
@@ -130,7 +130,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
- "corrupt value for 'next-id' key in '%s' table of filesystem '%s'",
+ "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'",
      table, fs->path);
 }
 
@@ -142,7 +142,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
- "corrupt entry in 'transactions' table for '%s'"
+ "Corrupt entry in 'transactions' table for '%s'"
      " in filesystem '%s'", txn, fs->path);
 }
 
@@ -153,7 +153,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
- "corrupt entry in 'copies' table for '%s' in filesystem '%s'",
+ "Corrupt entry in 'copies' table for '%s' in filesystem '%s'",
      copy_id, fs->path);
 }
 
@@ -175,7 +175,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_PATH_SYNTAX, 0,
- "search for malformed path '%s' in filesystem '%s'",
+ "Search for malformed path '%s' in filesystem '%s'",
      path, fs->path);
 }
 
@@ -186,7 +186,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_NO_SUCH_TRANSACTION, 0,
- "no transaction named '%s' in filesystem '%s'",
+ "No transaction named '%s' in filesystem '%s'",
      txn, fs->path);
 }
 
@@ -197,7 +197,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_TRANSACTION_NOT_MUTABLE, 0,
- "cannot modify transaction named '%s' in filesystem '%s'",
+ "Cannot modify transaction named '%s' in filesystem '%s'",
      txn, fs->path);
 }
 
@@ -208,7 +208,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_NO_SUCH_COPY, 0,
- "no copy with id '%s' in filesystem '%s'", copy_id, fs->path);
+ "No copy with id '%s' in filesystem '%s'", copy_id, fs->path);
 }
 
 
Index: subversion/libsvn_fs/dag.c
===================================================================
--- subversion/libsvn_fs/dag.c (revision 8012)
+++ subversion/libsvn_fs/dag.c (working copy)
@@ -658,13 +658,13 @@
   if (node->kind != svn_node_dir)
     return svn_error_create
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
- "Attempted to set entry in non-directory node.");
+ "Attempted to set entry in non-directory node");
   
   /* Check it's mutable. */
   if (! svn_fs__dag_check_mutable (node, txn_id))
     return svn_error_create
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
- "Attempted to set entry in immutable node.");
+ "Attempted to set entry in immutable node");
 
   return set_entry (node, entry_name, id, txn_id, trail);
 }
@@ -724,7 +724,7 @@
       svn_string_t *idstr = svn_fs_unparse_id (node->id, node->pool);
       return svn_error_createf
         (SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Can't set_proplist on *immutable* node-revision %s", idstr->data);
+ "Can't set proplist on *immutable* node-revision %s", idstr->data);
     }
 
   /* Go get a fresh NODE-REVISION for this node. */
@@ -947,13 +947,13 @@
   if (parent->kind != svn_node_dir)
     return svn_error_createf
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
- "Attempted to delete entry '%s' from *non*-directory node.", name);
+ "Attempted to delete entry '%s' from *non*-directory node", name);
 
   /* Make sure parent is mutable. */
   if (! svn_fs__dag_check_mutable (parent, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Attempted to delete entry '%s' from immutable directory node.", name);
+ "Attempted to delete entry '%s' from immutable directory node", name);
 
   /* Make sure that NAME is a single path component. */
   if (! svn_path_is_single_path_component (name))
@@ -1169,7 +1169,7 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to get textual contents of a *non*-file node.");
+ "Attempted to get textual contents of a *non*-file node");
   
   /* Go get a fresh node-revision for FILE. */
   SVN_ERR (get_node_revision (&noderev, file, trail));
@@ -1202,7 +1202,7 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to get length of a *non*-file node.");
+ "Attempted to get length of a *non*-file node");
 
   /* Go get a fresh node-revision for FILE, and . */
   SVN_ERR (get_node_revision (&noderev, file, trail));
@@ -1226,7 +1226,7 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to get checksum of a *non*-file node.");
+ "Attempted to get checksum of a *non*-file node");
 
   SVN_ERR (get_node_revision (&noderev, file, trail));
   if (noderev->data_key)
@@ -1255,13 +1255,13 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to set textual contents of a *non*-file node.");
+ "Attempted to set textual contents of a *non*-file node");
   
   /* Make sure our node is mutable. */
   if (! svn_fs__dag_check_mutable (file, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Attempted to set textual contents of an immutable node.");
+ "Attempted to set textual contents of an immutable node");
 
   /* Get the node revision. */
   SVN_ERR (get_node_revision (&noderev, file, trail));
@@ -1305,13 +1305,13 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
- "Attempted to set textual contents of a *non*-file node.");
+ "Attempted to set textual contents of a *non*-file node");
   
   /* Make sure our node is mutable. */
   if (! svn_fs__dag_check_mutable (file, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
- "Attempted to set textual contents of an immutable node.");
+ "Attempted to set textual contents of an immutable node");
 
   /* Get the node revision. */
   SVN_ERR (get_node_revision (&noderev, file, trail));
@@ -1333,7 +1333,7 @@
         return svn_error_createf
           (SVN_ERR_CHECKSUM_MISMATCH,
            NULL,
- "svn_fs__dag_finalize_edits: checksum mismatch, rep \"%s\":\n"
+ "Checksum mismatch, rep '%s':\n"
            " expected: %s\n"
            " actual: %s\n",
            noderev->edit_key, checksum, hex);
Index: subversion/libsvn_wc/merge.c
===================================================================
--- subversion/libsvn_wc/merge.c (revision 8012)
+++ subversion/libsvn_wc/merge.c (working copy)
@@ -296,13 +296,13 @@
       /* Don't forget to clean up tmp_target, result_target, tmp_left,
          tmp_right. There are a lot of scratch files lying around. */
       SVN_ERR_W (svn_io_remove_file (tmp_target, pool),
- "svn_wc_merge: unable to delete tmp file");
+ "Unable to delete temporary file");
       SVN_ERR_W (svn_io_remove_file (result_target, pool),
- "svn_wc_merge: unable to delete tmp file");
+ "Unable to delete temporary file");
       SVN_ERR_W (svn_io_remove_file (tmp_left, pool),
- "svn_wc_merge: unable to delete tmp file");
+ "Unable to delete temporary file");
       SVN_ERR_W (svn_io_remove_file (tmp_right, pool),
- "svn_wc_merge: unable to delete tmp file");
+ "Unable to delete temporary file");
 
     } /* end of merging for text files */
 
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 8012)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -765,7 +765,7 @@
   if (err)
     return
       svn_error_quick_wrap
- (err, "Failed to load properties from disk.");
+ (err, "Failed to load properties from disk");
 
   *value = apr_hash_get (prophash, name, APR_HASH_KEY_STRING);
   return SVN_NO_ERROR;
@@ -787,7 +787,7 @@
   if (err)
     return
       svn_error_quick_wrap
- (err, "Failed to load properties from disk.");
+ (err, "Failed to load properties from disk");
 
   /* Now we have all the properties in our hash. Simply merge the new
      property into it. */
@@ -1082,7 +1082,7 @@
   if (err)
     return
       svn_error_quick_wrap
- (err, "Failed to load properties from disk.");
+ (err, "Failed to load properties from disk");
 
   /* If we're changing this file's list of expanded keywords, then
    * we'll need to invalidate its text timestamp, since keyword
Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 8012)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -1716,7 +1716,7 @@
                             APR_HASH_KEY_STRING);
   if (! dot_entry)
     return svn_error_createf (SVN_ERR_ENTRY_NOT_FOUND, NULL,
- "Directory '%s' has no THIS_DIR entry!",
+ "Directory '%s' has no THIS_DIR entry",
                               dirpath);
 
   SVN_ERR (walk_callbacks->found_entry (dirpath, dot_entry, walk_baton, pool));
@@ -1773,7 +1773,7 @@
 
   if (! entry)
     return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "'%s' is not under version control.", path);
+ "'%s' is not under version control", path);
 
   if (entry->kind == svn_node_file)
     return walk_callbacks->found_entry (path, entry, walk_baton, pool);
@@ -1784,7 +1784,7 @@
 
   else
     return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "'%s' has an unrecognized node kind.", path);
+ "'%s' has an unrecognized node kind", path);
 }
 
 
Index: subversion/libsvn_wc/adm_crawler.c
===================================================================
--- subversion/libsvn_wc/adm_crawler.c (revision 8012)
+++ subversion/libsvn_wc/adm_crawler.c (working copy)
@@ -694,7 +694,7 @@
   /* Open a filehandle for tmp text-base. */
   SVN_ERR_W (svn_io_file_open (&localfile, tmp_base,
                                APR_READ, APR_OS_DEFAULT, pool),
- "svn_wc_transmit_text_deltas: error opening local file");
+ "Error opening local file");
 
   /* Create a text-delta stream object that pulls data out of the two
      files. */
Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c (revision 8012)
+++ subversion/libsvn_wc/adm_ops.c (working copy)
@@ -894,7 +894,7 @@
                               "'%s' not found", path);
   if (kind == svn_node_unknown)
     return svn_error_createf (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Unsupported node kind for path '%s'.", path);
+ "Unsupported node kind for path '%s'", path);
 
   /* Get the original entry for this path if one exists (perhaps
      this is actually a replacement of a previously deleted thing).
@@ -1372,7 +1372,7 @@
   if (! entry)
     return svn_error_createf
       (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Cannot revert '%s': not a versioned resource", path);
+ "Cannot revert: '%s' is not under version control", path);
 
   /* Safeguard 1.5: is this a missing versioned directory? */
   if (entry->kind == svn_node_dir)
@@ -1667,7 +1667,7 @@
                                        FALSE, adm_access, pool));
       if (text_modified_p && instant_error)
         return svn_error_createf (SVN_ERR_WC_LEFT_LOCAL_MOD, NULL,
- "File '%s' has local modifications.",
+ "File '%s' has local modifications",
                                   name);
 
       /* Remove NAME from PATH's entries file: */
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 8012)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -1265,7 +1265,7 @@
                                                adm_access, NULL,
                                                regular_props, TRUE, FALSE,
                                                db->pool, &entry_accum),
- "couldn't do prop merge.");
+ "Couldn't do property merge");
 
           /* Are the directory's props locally modified? */
           SVN_ERR (svn_wc_props_modified_p (&prop_modified,
@@ -1884,7 +1884,7 @@
         {
           SVN_ERR_W (svn_io_file_rename (new_text_path, final_location,
                                          pool),
- "install_file: move failed");
+ "Move failed");
 
           new_text_path = final_location;
         }
Index: subversion/libsvn_subr/time.c
===================================================================
--- subversion/libsvn_subr/time.c (revision 8012)
+++ subversion/libsvn_subr/time.c (working copy)
@@ -181,7 +181,7 @@
     return SVN_NO_ERROR;
 
   return svn_error_create(SVN_ERR_BAD_DATE, NULL,
- "Date conversion failed.");
+ "Date conversion failed");
 
  fail:
   /* Try the compatibility option. This does not need to be fast,
@@ -212,7 +212,7 @@
       if(apr_err != APR_SUCCESS)
         {
           return svn_error_create (SVN_ERR_BAD_DATE, NULL,
- "Date conversion failed.");
+ "Date conversion failed");
         }
 
       return SVN_NO_ERROR;
@@ -221,7 +221,7 @@
   else
     {
       return svn_error_create (SVN_ERR_BAD_DATE, NULL,
- "Date parsing failed.");
+ "Date parsing failed");
     }
 }
 
Index: subversion/libsvn_subr/utf.c
===================================================================
--- subversion/libsvn_subr/utf.c (revision 8012)
+++ subversion/libsvn_subr/utf.c (working copy)
@@ -211,7 +211,7 @@
                  "... was followed by non-ascii byte %d.\n"
                  "\n"
                  "Non-ascii character detected (see above), "
- "and unable to convert to/from UTF-8.\n",
+ "and unable to convert to/from UTF-8",
                  error_data, *((const unsigned char *) data));
             }
           else
@@ -219,7 +219,7 @@
               return svn_error_createf
                 (APR_EINVAL, NULL,
                  "Non-ascii character (code %d) detected, "
- "and unable to convert to/from UTF-8.\n",
+ "and unable to convert to/from UTF-8",
                  *((const unsigned char *) data));
             }
         }
Index: subversion/libsvn_subr/subst.c
===================================================================
--- subversion/libsvn_subr/subst.c (revision 8012)
+++ subversion/libsvn_subr/subst.c (working copy)
@@ -452,7 +452,7 @@
            (strncmp (src_format, newline_buf, newline_len))))
         return svn_error_create
           (SVN_ERR_IO_INCONSISTENT_EOL, NULL,
- "inconsistent line-endings in source stream, repair flag is off.");
+ "Inconsistent line-endings in source stream");
     }
   else
     {
Index: subversion/libsvn_subr/auth.c
===================================================================
--- subversion/libsvn_subr/auth.c (revision 8012)
+++ subversion/libsvn_subr/auth.c (working copy)
@@ -174,7 +174,7 @@
   table = apr_hash_get (auth_baton->tables, cred_kind, APR_HASH_KEY_STRING);
   if (! table)
     return svn_error_createf (SVN_ERR_AUTHN_NO_PROVIDER, NULL,
- "No provider registered for '%s' credentials.",
+ "No provider registered for '%s' credentials",
                               cred_kind);
 
   /* First, see if we have cached creds in the auth_baton. */
Index: subversion/libsvn_subr/opt.c
===================================================================
--- subversion/libsvn_subr/opt.c (revision 8012)
+++ subversion/libsvn_subr/opt.c (working copy)
@@ -412,7 +412,7 @@
       if (os->ind >= os->argc)
         {
           return svn_error_create (SVN_ERR_CL_ARG_PARSING_ERROR,
- 0, "too few arguments");
+ 0, "Too few arguments");
         }
       array_push_str (args, os->argv[os->ind++], pool);
     }
@@ -479,7 +479,7 @@
                                       &end_revision,
                                       native_rev, subpool))
             return svn_error_createf (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Syntax error parsing revision \"%s\"",
+ "Syntax error parsing revision '%s'",
                                       path + i + 1);
 
           *truepath = apr_pstrndup (pool, path, i);
@@ -582,7 +582,7 @@
             ;
           else
             return svn_error_createf (apr_err, NULL,
- "Error resolving case of '%s'.",
+ "Error resolving case of '%s'",
                                       utf8_target);
 
           /* convert back to UTF-8. */
Index: subversion/libsvn_subr/config_file.c
===================================================================
--- subversion/libsvn_subr/config_file.c (revision 8012)
+++ subversion/libsvn_subr/config_file.c (working copy)
@@ -363,10 +363,10 @@
     {
       if (errno != ENOENT)
         return svn_error_createf (SVN_ERR_BAD_FILENAME, NULL,
- "Can't open config file \"%s\"", file);
+ "Can't open config file '%s'", file);
       else if (must_exist && errno == ENOENT)
         return svn_error_createf (SVN_ERR_BAD_FILENAME, NULL,
- "Can't find config file \"%s\"", file);
+ "Can't find config file '%s'", file);
       else
         return SVN_NO_ERROR;
     }
Index: subversion/libsvn_subr/io.c
===================================================================
--- subversion/libsvn_subr/io.c (revision 8012)
+++ subversion/libsvn_subr/io.c (working copy)
@@ -188,8 +188,7 @@
   *unique_name_p = NULL;
   return svn_error_createf (SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED,
                             NULL,
- "svn_io_open_unique_file: unable to make name for "
- "'%s'", path);
+ "Unable to make name for '%s'", path);
 }
 
 #if 1 /* TODO: Remove this code when APR 0.9.6 is released. */
@@ -419,19 +418,19 @@
   SVN_ERR (svn_io_check_path (src, &kind, subpool));
   if (kind != svn_node_dir)
     return svn_error_createf (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
- "svn_io_copy_dir: '%s' is not a directory.",
+ "Source '%s' is not a directory",
                               src);
 
   SVN_ERR (svn_io_check_path (dst_parent, &kind, subpool));
   if (kind != svn_node_dir)
     return svn_error_createf (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
- "svn_io_copy_dir: '%s' is not a directory.",
+ "Destination '%s' is not a directory",
                               dst_parent);
 
   SVN_ERR (svn_io_check_path (dst_path, &kind, subpool));
   if (kind != svn_node_none)
     return svn_error_createf (SVN_ERR_ENTRY_EXISTS, NULL,
- "svn_io_copy_dir: '%s' already exists.",
+ "Destination '%s' already exists",
                               dst_path);
   
   SVN_ERR (svn_path_cstring_from_utf8 (&dst_path_apr, dst_path, pool));
@@ -441,7 +440,6 @@
   status = apr_dir_make (dst_path_apr, APR_OS_DEFAULT, pool);
   if (status)
     return svn_error_createf (status, NULL,
- "svn_io_copy_dir: "
                               "Unable to create directory '%s'",
                               dst_path);
 
@@ -805,7 +803,7 @@
   apr_err = apr_uid_current (&uid, &gid, pool);
 
   if (apr_err)
- return svn_error_wrap_apr(apr_err, "Error getting UID of process.");
+ return svn_error_wrap_apr(apr_err, "Error getting UID of process");
     
   /* Check executable bit for current user. */
   if (apr_uid_compare(uid, file_info.user) == APR_SUCCESS)
@@ -903,7 +901,7 @@
     return svn_error_create
         (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
          "svn_stringbuf_from_file: "
- "reading from stdin is currently broken, so disabled");
+ "Reading from stdin is currently broken, so disabled");
 
   SVN_ERR (svn_io_file_open (&f, filename, APR_READ, APR_OS_DEFAULT, pool));
 
@@ -1484,7 +1482,6 @@
      error. */
   if ((*exitcode != 0) && (*exitcode != 1))
     return svn_error_createf (SVN_ERR_EXTERNAL_PROGRAM, NULL,
- "svn_io_run_diff3: "
                               "Error running '%s': exitcode was %d, args were:"
                               "\nin directory '%s', basenames:\n%s\n%s\n%s",
                               diff3_utf8, *exitcode,
@@ -1514,8 +1511,7 @@
   SVN_ERR (svn_io_check_path (file, &kind, pool));
   if (kind != svn_node_file)
     return svn_error_createf (SVN_ERR_BAD_FILENAME, NULL,
- "svn_io_detect_mimetype: "
- "Can't detect mimetype of non-file '%s'",
+ "Can't detect MIME type of non-file '%s'",
                               file);
 
   SVN_ERR (svn_io_file_open (&fh, file, APR_READ, 0, pool));
@@ -2141,7 +2137,7 @@
   /* If there was no data in PATH, return an error. */
   if (len == 0)
     return svn_error_createf (SVN_ERR_STREAM_UNEXPECTED_EOF, NULL,
- "reading '%s'", path);
+ "Reading '%s'", path);
 
   /* Check that the first line contains only digits. */
   {
@@ -2156,7 +2152,7 @@
         if (! apr_isdigit (c))
           return svn_error_createf
             (SVN_ERR_BAD_VERSION_FILE_FORMAT, NULL,
- "first line of '%s' contains non-digit", path);
+ "First line of '%s' contains non-digit", path);
       }
   }
 
Index: subversion/libsvn_subr/sorts.c
===================================================================
--- subversion/libsvn_subr/sorts.c (revision 8012)
+++ subversion/libsvn_subr/sorts.c (working copy)
@@ -199,7 +199,7 @@
         /* Technically this can't happen, but might as well have the
            code ready in case that ever changes. */
         return svn_error_createf (SVN_ERR_BAD_PROP_KIND, NULL,
- "bad prop kind for property '%s'",
+ "Bad property kind for property '%s'",
                                   prop->name);
 
       if (newprop)
Index: subversion/libsvn_subr/config_win.c
===================================================================
--- subversion/libsvn_subr/config_win.c (revision 8012)
+++ subversion/libsvn_subr/config_win.c (working copy)
@@ -197,7 +197,7 @@
   else
     {
       return svn_error_createf (SVN_ERR_BAD_FILENAME, NULL,
- "Unrecognised registry path \"%s\"", file);
+ "Unrecognised registry path '%s'", file);
     }
 
   err = RegOpenKeyEx (base_hkey, file, 0,
@@ -208,10 +208,10 @@
       const int is_enoent = APR_STATUS_IS_ENOENT(APR_FROM_OS_ERROR(err));
       if (!is_enoent)
         return svn_error_createf (SVN_ERR_BAD_FILENAME, NULL,
- "Can't open registry key \"%s\"", file);
+ "Can't open registry key '%s'", file);
       else if (must_exist && is_enoent)
         return svn_error_createf (SVN_ERR_BAD_FILENAME, NULL,
- "Can't find registry key \"%s\"", file);
+ "Can't find registry key '%s'", file);
       else
         return SVN_NO_ERROR;
     }
Index: subversion/libsvn_subr/config_auth.c
===================================================================
--- subversion/libsvn_subr/config_auth.c (revision 8012)
+++ subversion/libsvn_subr/config_auth.c (working copy)
@@ -90,12 +90,12 @@
       SVN_ERR_W (svn_io_file_open (&authfile, auth_path,
                                    APR_READ | APR_BUFFERED, APR_OS_DEFAULT,
                                    pool),
- "unable to open auth file for reading");
+ "Unable to open auth file for reading");
       
       *hash = apr_hash_make (pool);
 
       SVN_ERR_W (svn_hash_read (*hash, authfile, pool),
- apr_psprintf (pool, "error parsing '%s'", auth_path));
+ apr_psprintf (pool, "Error parsing '%s'", auth_path));
       
       SVN_ERR (svn_io_file_close (authfile, pool));
     }
@@ -118,7 +118,7 @@
                            pool));
   if (! auth_path)
     return svn_error_create (SVN_ERR_NO_AUTH_FILE_PATH, NULL,
- "unable to locate auth file");
+ "Unable to locate auth file");
 
   /* Add the realmstring to the hash, so programs (or users) can
      verify exactly which set of credentials this file holds. */
@@ -129,10 +129,10 @@
                                (APR_WRITE | APR_CREATE | APR_TRUNCATE
                                 | APR_BUFFERED),
                                APR_OS_DEFAULT, pool),
- "unable to open auth file for writing");
+ "Unable to open auth file for writing");
   
   SVN_ERR_W (svn_hash_write (hash, authfile, pool),
- apr_psprintf (pool, "error writing hash to '%s'", auth_path));
+ apr_psprintf (pool, "Error writing hash to '%s'", auth_path));
 
   SVN_ERR (svn_io_file_close (authfile, pool));
 
Index: subversion/libsvn_subr/validate.c
===================================================================
--- subversion/libsvn_subr/validate.c (revision 8012)
+++ subversion/libsvn_subr/validate.c (working copy)
@@ -41,7 +41,7 @@
   if (strchr (mime_type, '/') == NULL)
     return svn_error_createf
       (SVN_ERR_BAD_MIME_TYPE, NULL,
- "Mime type \"%s\" missing '/'\n", mime_type);
+ "MIME type '%s' misses '/'", mime_type);
 
   {
     /* Could just take an optional `len' arg and avoid this strlen.
@@ -55,7 +55,7 @@
     if (! apr_isalnum (c))
       return svn_error_createf
         (SVN_ERR_BAD_MIME_TYPE, NULL,
- "Mime type \"%s\" ends with non-alphanumeric.\n", mime_type);
+ "MIME type '%s' ends with non-alphanumeric character", mime_type);
   }
 
   return SVN_NO_ERROR;
Index: subversion/libsvn_subr/path.c
===================================================================
--- subversion/libsvn_subr/path.c (revision 8012)
+++ subversion/libsvn_subr/path.c (working copy)
@@ -991,7 +991,7 @@
 
       if (apr_err)
         return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
- "Couldn't determine absolute path of '%s'.",
+ "Couldn't determine absolute path of '%s'",
                                  relative);
     }
 
@@ -1030,7 +1030,7 @@
   else
     {
       return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
- "'%s' is neither a file nor a directory name.",
+ "'%s' is neither a file nor a directory name",
                                path);
     }
 
Index: subversion/libsvn_ra_local/ra_plugin.c
===================================================================
--- subversion/libsvn_ra_local/ra_plugin.c (revision 8012)
+++ subversion/libsvn_ra_local/ra_plugin.c (working copy)
@@ -740,7 +740,7 @@
                  error was returned. According to the docstring, this
                  should never happen. */
               return svn_error_create (SVN_ERR_STREAM_UNEXPECTED_EOF, NULL,
- "Error writing to svn_stream.");
+ "Error writing to stream");
             }
           
           if (rlen != SVN_STREAM_CHUNK_SIZE)
Index: subversion/libsvn_ra_local/split_url.c
===================================================================
--- subversion/libsvn_ra_local/split_url.c (revision 8012)
+++ subversion/libsvn_ra_local/split_url.c (working copy)
@@ -43,8 +43,7 @@
   if (strncmp (URL, "file://", 7) != 0)
     return svn_error_createf
       (SVN_ERR_RA_ILLEGAL_URL, NULL,
- "svn_ra_local__split_URL: URL does not contain 'file://' prefix\n"
- " (%s)", URL);
+ "Local URL '%s' does not contain 'file://' prefix", URL);
   
   /* Then, skip what's between the "file://" prefix and the next
      occurance of '/' -- this is the hostname, and we are considering
@@ -55,16 +54,14 @@
   if (! path)
     return svn_error_createf
       (SVN_ERR_RA_ILLEGAL_URL, NULL,
- "svn_ra_local__split_URL: URL contains only a hostname, no path\n"
- " (%s)", URL);
+ "Local URL '%s' contains only a hostname, no path", URL);
 
   /* Currently, the only hostnames we are allowing are the empty
      string and 'localhost' */
   if ((hostname != path) && (strncmp (hostname, "localhost/", 10) != 0))
     return svn_error_createf
       (SVN_ERR_RA_ILLEGAL_URL, NULL,
- "svn_ra_local__split_URL: URL contains unsupported hostname\n"
- " (%s)", URL);
+ "Local URL '%s' contains unsupported hostname", URL);
 
 
   /* Duplicate the URL, starting at the top of the path */
Index: subversion/svnlook/main.c
===================================================================
--- subversion/svnlook/main.c (revision 8012)
+++ subversion/svnlook/main.c (working copy)
@@ -1117,7 +1117,7 @@
   if (! SVN_IS_VALID_REVNUM (base_rev_id))
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_REVISION, NULL,
- "Transaction '%s' is not based on a revision. How odd.",
+ "Transaction '%s' is not based on a revision; how odd",
        c->txn_name);
   
   SVN_ERR (generate_delta_tree (&tree, c->repos, root, base_rev_id,
@@ -1147,10 +1147,10 @@
       if (svn_path_is_url (path)) /* check for a common mistake. */
         return svn_error_createf
           (SVN_ERR_FS_NOT_FOUND, NULL,
- "'%s' is a URL, probably should be a path.", path);
+ "'%s' is a URL, probably should be a path", path);
       else
         return svn_error_createf
- (SVN_ERR_FS_NOT_FOUND, NULL, "Path '%s' does not exist.", path);
+ (SVN_ERR_FS_NOT_FOUND, NULL, "Path '%s' does not exist", path);
     }
 
   return SVN_NO_ERROR;
@@ -1174,7 +1174,7 @@
 
   if (kind != svn_node_file)
     return svn_error_createf
- (SVN_ERR_FS_NOT_FILE, NULL, "Path '%s' is not a file.", path);
+ (SVN_ERR_FS_NOT_FILE, NULL, "Path '%s' is not a file", path);
 
   /* Else. */
 
@@ -1207,7 +1207,7 @@
   if (! SVN_IS_VALID_REVNUM (base_rev_id))
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_REVISION, NULL,
- "Transaction '%s' is not based on a revision. How odd.",
+ "Transaction '%s' is not based on a revision; how odd",
        c->txn_name);
   
   SVN_ERR (generate_delta_tree (&tree, c->repos, root, base_rev_id,
@@ -1236,7 +1236,7 @@
   if (! SVN_IS_VALID_REVNUM (base_rev_id))
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_REVISION, NULL,
- "Transaction '%s' is not based on a revision. How odd.",
+ "Transaction '%s' is not based on a revision; how odd",
        c->txn_name);
   
   SVN_ERR (generate_delta_tree (&tree, c->repos, root, base_rev_id,
@@ -1351,7 +1351,7 @@
   if (prop == NULL)
     return svn_error_createf
       (SVN_ERR_PROPERTY_NOT_FOUND, NULL,
- "Property '%s' not found on path '%s'.", propname, path);
+ "Property '%s' not found on path '%s'", propname, path);
 
   /* Else. */
 
@@ -1487,7 +1487,7 @@
   if (opt_state->arg1 == NULL)
     return svn_error_createf
       (SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "Missing repository path argument.");
+ "Missing repository path argument");
 
   SVN_ERR (get_ctxt_baton (&c, opt_state, pool));
   SVN_ERR (do_cat (c, opt_state->arg1, pool));
@@ -1618,13 +1618,13 @@
     {
       return svn_error_createf
         (SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "Missing propname and repository path arguments.");
+ "Missing propname and repository path arguments");
     }
   else if (opt_state->arg2 == NULL)
     {
       return svn_error_createf
         (SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "Missing propname or repository path argument.");
+ "Missing propname or repository path argument");
     }
 
   SVN_ERR (get_ctxt_baton (&c, opt_state, pool));
@@ -1642,7 +1642,7 @@
   if (opt_state->arg1 == NULL)
     return svn_error_createf
       (SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "Missing repository path argument.");
+ "Missing repository path argument");
 
   SVN_ERR (get_ctxt_baton (&c, opt_state, pool));
   SVN_ERR (do_plist (c, opt_state->arg1, opt_state->verbose, pool));
@@ -1762,7 +1762,7 @@
           if (! SVN_IS_VALID_REVNUM (opt_state.rev))
             SVN_INT_ERR (svn_error_create
                          (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Invalid revision number supplied."));
+ "Invalid revision number supplied"));
           break;
 
         case 't':
@@ -1804,7 +1804,7 @@
     SVN_INT_ERR (svn_error_create
                  (SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
                   "The '--transaction' (-t) and '--revision' (-r) arguments "
- "may no co-exist."));
+ "can not co-exist"));
 
   /* If the user asked for help, then the rest of the arguments are
      the names of subcommands to get help on (if any), or else they're
Index: subversion/libsvn_client/delete.c
===================================================================
--- subversion/libsvn_client/delete.c (revision 8012)
+++ subversion/libsvn_client/delete.c (working copy)
@@ -59,7 +59,7 @@
   if (status->text_status == svn_wc_status_obstructed)
     sb->err = svn_error_createf (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
                                  "'%s' is in the way of the resource "
- "actually under version control.", path);
+ "actually under version control", path);
   else if (! status->entry)
     sb->err = svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
                                  "'%s' is not under version control", path);
Index: subversion/libsvn_client/export.c
===================================================================
--- subversion/libsvn_client/export.c (revision 8012)
+++ subversion/libsvn_client/export.c (working copy)
@@ -84,8 +84,8 @@
             return err;
           if (! force)
             SVN_ERR_W (err,
- "Destination directory exists. Please remove the "
- "directory, or use --force to override this error.");
+ "Destination directory exists. Please remove the "
+ "directory or use --force to override this error");
           else
             svn_error_clear (err);
         }
Index: subversion/libsvn_client/prop_commands.c
===================================================================
--- subversion/libsvn_client/prop_commands.c (revision 8012)
+++ subversion/libsvn_client/prop_commands.c (working copy)
@@ -148,7 +148,7 @@
          if it's ever to support setting properties remotely. */
       return svn_error_createf
         (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Setting property on non-local target '%s' not yet supported.",
+ "Setting property on non-local target '%s' not yet supported",
          target);
     }
 
Index: subversion/libsvn_client/checkout.c
===================================================================
--- subversion/libsvn_client/checkout.c (revision 8012)
+++ subversion/libsvn_client/checkout.c (working copy)
@@ -158,7 +158,7 @@
       else
         {
           return svn_error_createf (SVN_ERR_WC_NODE_KIND_CHANGE, NULL,
- "'%s' is already a file/something else.",
+ "'%s' is already a file/something else",
                                     path);
         }
 
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 8012)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1433,7 +1433,7 @@
 {
   return svn_error_create (SVN_ERR_INCORRECT_PARAMS, child_err,
                            "Sorry, svn_client_diff was called in a way "
- "that is not yet supported.");
+ "that is not yet supported");
 }
 
 
Index: subversion/libsvn_client/copy.c
===================================================================
--- subversion/libsvn_client/copy.c (revision 8012)
+++ subversion/libsvn_client/copy.c (working copy)
@@ -77,7 +77,7 @@
   SVN_ERR (svn_io_check_path (src_path, &src_kind, pool));
   if (src_kind == svn_node_none)
     return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "Path '%s' does not exist.", src_path);
+ "Path '%s' does not exist", src_path);
 
   /* If DST_PATH does not exist, then its basename will become a new
      file or dir added to its parent (possibly an implicit '.'). If
@@ -96,7 +96,7 @@
     }
   else
     return svn_error_createf (SVN_ERR_ENTRY_EXISTS, NULL,
- "File '%s' already exists.", dst_path);
+ "File '%s' already exists", dst_path);
 
   if (is_move)
     {
@@ -407,12 +407,12 @@
                                    &attempt_kind, pool));
       if (attempt_kind != svn_node_none)
         return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, NULL,
- "Path '%s' already exists.", dst_rel);
+ "Path '%s' already exists", dst_rel);
     }
   else
     {
       return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "Unrecognized node kind of '%s'.", dst_url);
+ "Unrecognized node kind of '%s'", dst_url);
     }
 
   /* Create a new commit item and add it to the array. */
@@ -627,7 +627,7 @@
       /* DST_URL is an existing file, which can't be overwritten or
          used as a container, so error out. */
       return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, NULL,
- "File '%s' already exists.", dst_url);
+ "File '%s' already exists", dst_url);
     }
 
   /* Create a new commit item and add it to the array. */
@@ -815,7 +815,7 @@
   else if (dst_kind != svn_node_none) /* must be a file */
     {
       return svn_error_createf (SVN_ERR_ENTRY_EXISTS, NULL,
- "File '%s' already exists.", dst_path);
+ "File '%s' already exists", dst_path);
     }
 
   /* Now that dst_path has possibly been reset, check that there's
@@ -926,7 +926,7 @@
              at the moment when we pass a NULL copyfromurl. */
           
           return svn_error_create (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Source URL is from foreign repository.");
+ "Source URL is from foreign repository");
         }
     } /* end directory case */
 
Index: subversion/libsvn_client/ls.c
===================================================================
--- subversion/libsvn_client/ls.c (revision 8012)
+++ subversion/libsvn_client/ls.c (working copy)
@@ -43,7 +43,7 @@
                               NULL, NULL, pool));
   else
     return svn_error_create (SVN_ERR_RA_NOT_IMPLEMENTED, NULL,
- "No get_dir() available for URL schema.");
+ "No get_dir() available for URL schema");
 
   for (hi = apr_hash_first (pool, tmpdirents);
        hi;
@@ -135,20 +135,20 @@
                                   NULL, NULL, pool));
       else
         return svn_error_create (SVN_ERR_RA_NOT_IMPLEMENTED, NULL,
- "No get_dir() available for URL schema.");
+ "No get_dir() available for URL schema");
 
       /* Copy the relevant entry into the caller's hash. */
       *dirents = apr_hash_make (pool);
       the_ent = apr_hash_get (parent_ents, base_name, APR_HASH_KEY_STRING);
       if (the_ent == NULL)
         return svn_error_create (SVN_ERR_FS_NOT_FOUND, NULL,
- "URL non-existent in that revision.");
+ "URL non-existent in that revision");
         
       apr_hash_set (*dirents, base_name, APR_HASH_KEY_STRING, the_ent);
     }
   else
     return svn_error_create (SVN_ERR_FS_NOT_FOUND, NULL,
- "URL non-existent in that revision.");
+ "URL non-existent in that revision");
 
   return SVN_NO_ERROR;
 }
Index: subversion/libsvn_client/commit_util.c
===================================================================
--- subversion/libsvn_client/commit_util.c (revision 8012)
+++ subversion/libsvn_client/commit_util.c (working copy)
@@ -267,7 +267,7 @@
   /* Bail now if any conflicts exist for the ENTRY. */
   if (tc || pc)
     return svn_error_createf (SVN_ERR_WC_FOUND_CONFLICT, NULL,
- "Aborting commit: '%s' remains in conflict.",
+ "Aborting commit: '%s' remains in conflict",
                               path);
 
   /* If we have our own URL, and we're NOT in COPY_MODE, it wins over
@@ -683,7 +683,7 @@
               (SVN_ERR_ILLEGAL_TARGET, NULL,
                "'%s' is not under version control "
                "and is not part of the commit, "
- "yet its child '%s' is part of the commit.",
+ "yet its child '%s' is part of the commit",
                dangling_parent, dangling_child);
           }
       }
@@ -761,7 +761,7 @@
       if ((last_item) && (strcmp (last_item->url, url) == 0))
         return svn_error_createf
           (SVN_ERR_CLIENT_DUPLICATE_COMMIT_URL, NULL,
- "Cannot commit both '%s' and '%s' as they refer to the same URL.",
+ "Cannot commit both '%s' and '%s' as they refer to the same URL",
            item->path, last_item->path);
 
       /* In the first iteration, our BASE_URL is just our only
Index: subversion/libsvn_client/cleanup.c
===================================================================
--- subversion/libsvn_client/cleanup.c (revision 8012)
+++ subversion/libsvn_client/cleanup.c (working copy)
@@ -50,7 +50,7 @@
   SVN_ERR (svn_io_check_path (dir, &kind, pool));
   if (kind != svn_node_dir)
     return svn_error_createf (SVN_ERR_WC_NOT_DIRECTORY, NULL,
- "Cannot cleanup '%s' -- not a directory",
+ "Cannot cleanup '%s': not a directory",
                               dir);
 
   svn_config_get (cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS,
Index: subversion/libsvn_client/commit.c
===================================================================
--- subversion/libsvn_client/commit.c (revision 8012)
+++ subversion/libsvn_client/commit.c (working copy)
@@ -396,7 +396,7 @@
   else if (kind == svn_node_none)
     {
       return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL,
- "'%s' does not exist.", path);
+ "'%s' does not exist", path);
     }
 
   /* Close up shop; it's time to go home. */
Index: subversion/bindings/swig/swigutil_java.c
===================================================================
--- subversion/bindings/swig/swigutil_java.c (revision 8012)
+++ subversion/bindings/swig/swigutil_java.c (working copy)
@@ -341,7 +341,7 @@
   else
     {
       status = APR_EGENERAL;
- msg = "the Java callback raised an exception";
+ msg = "The Java callback raised an exception";
     }
   result = svn_error_create(status, NULL, msg);
 
Index: subversion/bindings/swig/swigutil_py.c
===================================================================
--- subversion/bindings/swig/swigutil_py.c (revision 8012)
+++ subversion/bindings/swig/swigutil_py.c (working copy)
@@ -429,7 +429,7 @@
 static svn_error_t * convert_python_error(void)
 {
   return svn_error_create(SVN_ERR_SWIG_PY_EXCEPTION_SET, NULL,
- "the Python callback raised an exception");
+ "The Python callback raised an exception");
 }
 
 
Index: subversion/mod_dav_svn/repos.c
===================================================================
--- subversion/mod_dav_svn/repos.c (revision 8012)
+++ subversion/mod_dav_svn/repos.c (working copy)
@@ -1853,7 +1853,7 @@
   APR_BRIGADE_INSERT_TAIL(bb, bkt);
   if ((status = ap_pass_brigade(dc->output, bb)) != APR_SUCCESS) {
     return svn_error_create(status, NULL,
- "Could not write data to filter.");
+ "Could not write data to filter");
   }
 
   return SVN_NO_ERROR;
@@ -1871,7 +1871,7 @@
   bkt = apr_bucket_eos_create(dc->output->c->bucket_alloc);
   APR_BRIGADE_INSERT_TAIL(bb, bkt);
   if ((status = ap_pass_brigade(dc->output, bb)) != APR_SUCCESS)
- return svn_error_create(status, NULL, "Could not write EOS to filter.");
+ return svn_error_create(status, NULL, "Could not write EOS to filter");
 
   return SVN_NO_ERROR;
 }
@@ -2393,15 +2393,15 @@
                                       resource->pool);
       if (serr)
         return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "Could not get created rev of resource.");
+ "Could not get created rev of resource");
 
       if (resource->info->version_name < created_rev)
         {
           serr = svn_error_createf (SVN_ERR_RA_OUT_OF_DATE, NULL,
- "Item '%s' is out of date.",
+ "Item '%s' is out of date",
                                     resource->info->repos_path);
           return dav_svn_convert_err(serr, HTTP_CONFLICT,
- "Can't DELETE out-of-date resource.");
+ "Can't DELETE out-of-date resource");
         }
     }
 
@@ -2411,7 +2411,7 @@
     {
       /* ### need a better error */
       return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "Could not delete the resource.");
+ "Could not delete the resource");
     }
 
   /* Auto-versioning commit of the txn. */
Index: subversion/mod_dav_svn/activity.c
===================================================================
--- subversion/mod_dav_svn/activity.c (revision 8012)
+++ subversion/mod_dav_svn/activity.c (working copy)
@@ -177,7 +177,7 @@
       svn_error_t *serr = svn_error_wrap_apr(status, "Can't open activity db");
 
       return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "could not open dbm files.");
+ "Could not open dbm files.");
     }
 
   key.dptr = (char *)activity_id;
Index: subversion/mod_dav_svn/util.c
===================================================================
--- subversion/mod_dav_svn/util.c (revision 8012)
+++ subversion/mod_dav_svn/util.c (working copy)
@@ -218,8 +218,8 @@
       || memcmp(path, relative->info->repos->root_path, len2) != 0)
     {
       return svn_error_create(SVN_ERR_APMOD_MALFORMED_URI, NULL,
- "The specified URI does not refer to this "
- "repository, so it is unusable.");
+ "Ununsable URI: it does not refer to this "
+ "repository");
     }
 
   /* prep the return value */
@@ -298,12 +298,11 @@
 
  malformed_uri:
     return svn_error_create(SVN_ERR_APMOD_MALFORMED_URI, NULL,
- "The specified URI could not be parsed.");
+ "The specified URI could not be parsed");
 
  unhandled_form:
   return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "dav_svn_simple_parse_uri does not support that "
- "URI form yet.");
+ "Unsupported URI form");
 }
 
 /* ### move this into apr_xml */
Index: subversion/clients/cmdline/merge-cmd.c
===================================================================
--- subversion/clients/cmdline/merge-cmd.c (revision 8012)
+++ subversion/clients/cmdline/merge-cmd.c (working copy)
@@ -58,7 +58,7 @@
           svn_opt_subcommand_help ("merge", svn_cl__cmd_table,
                                    svn_cl__options, pool);
           return svn_error_create (SVN_ERR_CL_INSUFFICIENT_ARGS, 0,
- "Second revision required.");
+ "Second revision required");
         }
       using_alternate_syntax = TRUE;
     }
@@ -82,7 +82,7 @@
           svn_opt_subcommand_help ("merge", svn_cl__cmd_table,
                                    svn_cl__options, pool);
           return svn_error_create (SVN_ERR_CL_INSUFFICIENT_ARGS, 0,
- "Wrong number of paths given.");
+ "Wrong number of paths given");
         }
 
       /* the first path becomes both of the 'sources' */
@@ -101,7 +101,7 @@
           svn_opt_subcommand_help ("merge", svn_cl__cmd_table,
                                    svn_cl__options, pool);
           return svn_error_create (SVN_ERR_CL_INSUFFICIENT_ARGS, 0,
- "Wrong number of paths given.");
+ "Wrong number of paths given");
         }
 
       /* the first two paths become the 'sources' */
Index: subversion/clients/cmdline/props.c
===================================================================
--- subversion/clients/cmdline/props.c (revision 8012)
+++ subversion/clients/cmdline/props.c (working copy)
@@ -42,7 +42,7 @@
   return svn_error_create
     (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
      "Must specify revision explicitly when operating on a "
- "revision property.");
+ "revision property");
 }
 
 
Index: subversion/clients/cmdline/propdel-cmd.c
===================================================================
--- subversion/clients/cmdline/propdel-cmd.c (revision 8012)
+++ subversion/clients/cmdline/propdel-cmd.c (working copy)
@@ -78,12 +78,12 @@
          which needs to be converted to a URL. */
       if (targets->nelts <= 0)
         return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "No URL target available.");
+ "No URL target available");
       target = ((const char **) (targets->elts))[0];
       SVN_ERR (svn_client_url_from_path (&URL, target, pool));
       if (URL == NULL)
         return svn_error_create(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Either a URL or versioned item is required.");
+ "Either a URL or versioned item is required");
 
       /* Let libsvn_client do the real work. */
       SVN_ERR (svn_client_revprop_set (pname_utf8, NULL,
@@ -103,7 +103,7 @@
     {
       return svn_error_createf
         (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Cannot specify revision for deleting versioned property '%s'.",
+ "Cannot specify revision for deleting versioned property '%s'",
          pname);
     }
   else /* operate on a normal, versioned property (not a revprop) */
Index: subversion/clients/cmdline/util.c
===================================================================
--- subversion/clients/cmdline/util.c (revision 8012)
+++ subversion/clients/cmdline/util.c (working copy)
@@ -121,7 +121,7 @@
     return svn_error_create
       (SVN_ERR_CL_NO_EXTERNAL_EDITOR, NULL,
        "None of the environment variables SVN_EDITOR, VISUAL or EDITOR is "
- "set, and no 'editor-cmd' run-time configuration option was found.");
+ "set, and no 'editor-cmd' run-time configuration option was found");
 
   /* Convert file contents from UTF-8 */
   SVN_ERR (svn_utf_cstring_from_utf8 (&contents_native, contents, pool));
@@ -290,7 +290,7 @@
              a deliberate encoding, and even if it is, we still
              can't handle it. */
           return svn_error_create (SVN_ERR_CL_BAD_LOG_MESSAGE, NULL,
- "Log message contains a zero byte.");
+ "Log message contains a zero byte");
         }
       lmb->message = opt_state->filedata->data;
     }
@@ -518,7 +518,7 @@
             err = svn_error_quick_wrap
               (err, "Could not use external editor to fetch log message; "
                "consider setting the $SVN_EDITOR environment variable "
- "or using the --message (-m) or --file (-F) options.");
+ "or using the --message (-m) or --file (-F) options");
           return err;
         }
 
Index: subversion/clients/cmdline/propget-cmd.c
===================================================================
--- subversion/clients/cmdline/propget-cmd.c (revision 8012)
+++ subversion/clients/cmdline/propget-cmd.c (working copy)
@@ -103,12 +103,12 @@
          which needs to be converted to a URL. */
       if (targets->nelts <= 0)
         return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "No URL target available.");
+ "No URL target available");
       target = ((const char **) (targets->elts))[0];
       SVN_ERR (svn_client_url_from_path (&URL, target, pool));
       if (URL == NULL)
         return svn_error_create(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Either a URL or versioned item is required.");
+ "Either a URL or versioned item is required");
       
       /* Let libsvn_client do the real work. */
       SVN_ERR (svn_client_revprop_get (pname_utf8, &propval,
Index: subversion/clients/cmdline/propset-cmd.c
===================================================================
--- subversion/clients/cmdline/propset-cmd.c (revision 8012)
+++ subversion/clients/cmdline/propset-cmd.c (working copy)
@@ -80,7 +80,7 @@
     if (opt_state->encoding)
       return svn_error_create
         (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Bad encoding option: prop value not stored as UTF8.");
+ "Bad encoding option: prop value not stored as UTF8");
   
   /* Suck up all the remaining arguments into a targets array */
   SVN_ERR (svn_opt_args_to_target_array (&targets, os,
@@ -109,12 +109,12 @@
          which needs to be converted to a URL. */
       if (targets->nelts <= 0)
         return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "No URL target available.");
+ "No URL target available");
       target = ((const char **) (targets->elts))[0];
       SVN_ERR (svn_client_url_from_path (&URL, target, pool));
       if (URL == NULL)
         return svn_error_create(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Either a URL or versioned item is required.");
+ "Either a URL or versioned item is required");
 
       /* Let libsvn_client do the real work. */
       SVN_ERR (svn_client_revprop_set (pname_utf8, propval,
@@ -131,7 +131,7 @@
     {
       return svn_error_createf
         (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Cannot specify revision for setting versioned property '%s'.",
+ "Cannot specify revision for setting versioned property '%s'",
          pname);
     }
   else /* operate on a normal, versioned property (not a revprop) */
@@ -163,14 +163,14 @@
             {
               return svn_error_createf
                 (SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "explicit target required ('%s' interpreted as prop value)",
+ "Explicit target required ('%s' interpreted as prop value)",
                  propval->data);
             }
           else
             {
               return svn_error_create
                 (SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "explicit target argument required.\n");
+ "Explicit target argument required");
             }
         }
 
Index: subversion/clients/cmdline/import-cmd.c
===================================================================
--- subversion/clients/cmdline/import-cmd.c (revision 8012)
+++ subversion/clients/cmdline/import-cmd.c (working copy)
@@ -83,11 +83,11 @@
   if (targets->nelts < 1)
     return svn_error_create
       (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "repository URL required when importing");
+ "Repository URL required when importing");
   else if (targets->nelts > 2)
     return svn_error_create
       (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "too many arguments to import command");
+ "Too many arguments to import command");
   else if (targets->nelts == 1)
     {
       url = ((const char **) (targets->elts))[0];
@@ -102,7 +102,7 @@
   if (! svn_path_is_url (url))
     return svn_error_createf
       (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "invalid URL '%s'", url);
+ "Invalid URL '%s'", url);
 
   if (! opt_state->quiet)
     svn_cl__get_notifier (&ctx->notify_func, &ctx->notify_baton,
Index: subversion/clients/cmdline/proplist-cmd.c
===================================================================
--- subversion/clients/cmdline/proplist-cmd.c (revision 8012)
+++ subversion/clients/cmdline/proplist-cmd.c (working copy)
@@ -72,12 +72,12 @@
          which needs to be converted to a URL. */
       if (targets->nelts <= 0)
         return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "No URL target available.");
+ "No URL target available");
       target = ((const char **) (targets->elts))[0];
       SVN_ERR (svn_client_url_from_path (&URL, target, pool));
       if (URL == NULL)
         return svn_error_create(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Either a URL or versioned item is required.");
+ "Either a URL or versioned item is required");
   
       /* Let libsvn_client do the real work. */
       SVN_ERR (svn_client_revprop_list (&proplist,
Index: subversion/clients/cmdline/export-cmd.c
===================================================================
--- subversion/clients/cmdline/export-cmd.c (revision 8012)
+++ subversion/clients/cmdline/export-cmd.c (working copy)
@@ -73,8 +73,8 @@
                            opt_state->force, ctx, pool);
   if (err && err->apr_err == SVN_ERR_WC_OBSTRUCTED_UPDATE && !opt_state->force)
     SVN_ERR_W (err,
- "Destination directory exists. Please remove\n"
- "the directory, use --force to ovewrite.");
+ "Destination directory exists; Please remove "
+ "the directory or use --force to ovewrite.");
   else
     SVN_ERR (err);
 
Index: subversion/clients/cmdline/main.c
===================================================================
--- subversion/clients/cmdline/main.c (revision 8012)
+++ subversion/clients/cmdline/main.c (working copy)
@@ -622,7 +622,7 @@
 svn_cl__check_cancel (void *baton)
 {
   if (cancelled)
- return svn_error_create (SVN_ERR_CANCELLED, NULL, "caught SIGINT");
+ return svn_error_create (SVN_ERR_CANCELLED, NULL, "Caught SIGINT");
   else
     return SVN_NO_ERROR;
 }
@@ -926,7 +926,7 @@
           {
             err = svn_error_create (SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
                                     "--auto-props and --no-auto-props are "
- "mutually exclusive.");
+ "mutually exclusive");
             svn_handle_error (err, stderr, FALSE);
             svn_error_clear (err);
             svn_pool_destroy (pool);
@@ -939,7 +939,7 @@
           {
             err = svn_error_create (SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
                                     "--auto-props and --no-auto-props are "
- "mutually exclusive.");
+ "mutually exclusive");
             svn_handle_error (err, stderr, FALSE);
             svn_error_clear (err);
             svn_pool_destroy (pool);
@@ -1049,7 +1049,7 @@
           err = svn_error_create (SVN_ERR_CL_LOG_MESSAGE_IS_VERSIONED_FILE,
                                   NULL,
                                   "Log message file is a versioned file; "
- "use '--force-log' to override.");
+ "use '--force-log' to override");
           svn_handle_error (err, stderr, FALSE);
           svn_error_clear (err);
           svn_pool_destroy (pool);
@@ -1063,7 +1063,7 @@
           err = svn_error_create (SVN_ERR_CL_LOG_MESSAGE_IS_PATHNAME, NULL,
                                   "The log message is a pathname "
                                   "(was -F intended?); use '--force-log' "
- "to override.");
+ "to override");
           svn_handle_error (err, stderr, FALSE);
           svn_error_clear (err);
           svn_pool_destroy (pool);
Index: subversion/clients/cmdline/propedit-cmd.c
===================================================================
--- subversion/clients/cmdline/propedit-cmd.c (revision 8012)
+++ subversion/clients/cmdline/propedit-cmd.c (working copy)
@@ -85,12 +85,12 @@
          which needs to be converted to a URL. */
       if (targets->nelts <= 0)
         return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "No URL target available.");
+ "No URL target available");
       target = ((const char **) (targets->elts))[0];
       SVN_ERR (svn_client_url_from_path (&URL, target, pool));
       if (URL == NULL)
         return svn_error_create(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
- "Either a URL or versioned item is required.");
+ "Either a URL or versioned item is required");
 
       /* Fetch the current property. */
       SVN_ERR (svn_client_revprop_get (pname_utf8, &propval,
@@ -122,7 +122,7 @@
             if (opt_state->encoding)
               return svn_error_create
                 (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Bad encoding option: prop's value isn't stored as UTF8.");
+ "Bad encoding option: prop's value isn't stored as UTF8");
           
           SVN_ERR (svn_client_revprop_set (pname_utf8, propval,
                                            URL, &(opt_state->start_revision),
@@ -141,7 +141,7 @@
     {
       return svn_error_createf
         (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "Cannot specify revision for editing versioned property '%s'.",
+ "Cannot specify revision for editing versioned property '%s'",
          pname);
     }
   else /* operate on a normal, versioned property (not a revprop) */
@@ -167,7 +167,7 @@
         {
           return svn_error_create
             (SVN_ERR_CL_INSUFFICIENT_ARGS, NULL,
- "explicit target argument required.\n");
+ "Explicit target argument required");
         }
 
       /* For each target, edit the property PNAME. */
@@ -192,7 +192,7 @@
               return svn_error_createf
                 (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
                  "Editing property on non-local target '%s' "
- "not yet supported.", target);
+ "not yet supported", target);
             }
 
           /* Fetch the current property. */
@@ -247,7 +247,7 @@
                 if (opt_state->encoding)
                   return svn_error_create
                     (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- "Bad encoding option: prop value not stored as UTF8.");
+ "Bad encoding option: prop value not stored as UTF8");
               
               SVN_ERR (svn_client_propset (pname_utf8, propval, target,
                                            FALSE, subpool));
Index: subversion/tests/clients/cmdline/commit_tests.py
===================================================================
--- subversion/tests/clients/cmdline/commit_tests.py (revision 8012)
+++ subversion/tests/clients/cmdline/commit_tests.py (working copy)
@@ -772,7 +772,7 @@
   svntest.actions.run_and_verify_commit (wc_dir,
                                          None,
                                          None,
- "out.of.date",
+ "Out of date",
                                          None, None,
                                          None, None,
                                          wc_dir)
@@ -1772,7 +1772,7 @@
   outlines, errlines = svntest.main.run_svn(1, 'commit', '-m', 'blah',
                                             omega_path)
   for line in errlines:
- if re.match(".*out of date.*", line):
+ if re.match(".*Out of date.*", line):
       break
   else:
     raise svntest.Failure
@@ -1782,7 +1782,7 @@
   outlines, errlines = svntest.main.run_svn(1, 'commit', '-m', 'blah',
                                             C_path)
   for line in errlines:
- if re.match(".*out of date.*", line):
+ if re.match(".*Out of date.*", line):
       break
   else:
     raise svntest.Failure
Index: subversion/tests/clients/cmdline/switch_tests.py
===================================================================
--- subversion/tests/clients/cmdline/switch_tests.py (revision 8012)
+++ subversion/tests/clients/cmdline/switch_tests.py (working copy)
@@ -180,7 +180,7 @@
   # same URL. We don't allow this.
   svntest.actions.run_and_verify_commit(
     wc_dir, None, None,
- "svn: Cannot commit both .* as they refer to the same URL.$",
+ "svn: Cannot commit both .* as they refer to the same URL$",
     None, None, None, None,
     wc_dir)
 
Index: subversion/svndumpfilter/main.c
===================================================================
--- subversion/svndumpfilter/main.c (revision 8012)
+++ subversion/svndumpfilter/main.c (working copy)
@@ -441,7 +441,7 @@
                   /* bail out with an error */
                   return svn_error_createf
                     (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
- "Node with dropped parent sneaked in.");
+ "Node with dropped parent sneaked in");
                 }
               SVN_ERR (svn_stream_printf
                        (header_stream, pool,
Index: subversion/libsvn_repos/load.c
===================================================================
--- subversion/libsvn_repos/load.c (revision 8012)
+++ subversion/libsvn_repos/load.c (working copy)
@@ -124,7 +124,7 @@
           if (header_str->data[i] == '\0')
             return svn_error_create (SVN_ERR_STREAM_MALFORMED_DATA, NULL,
                                      "Found malformed header block "
- "in dumpfile stream.");
+ "in dumpfile stream");
           i++;
         }
       /* Create a 'name' string and point to it. */
@@ -136,7 +136,7 @@
       if (i > header_str->len)
         return svn_error_create (SVN_ERR_STREAM_MALFORMED_DATA, NULL,
                                  "Found malformed header block "
- "in dumpfile stream.");
+ "in dumpfile stream");
 
       /* Point to the 'value' string. */
       value = header_str->data + i;
@@ -153,14 +153,14 @@
 stream_ran_dry (void)
 {
   return svn_error_create (SVN_ERR_INCOMPLETE_DATA, NULL,
- "Premature end of content data in dumpstream.");
+ "Premature end of content data in dumpstream");
 }
 
 static svn_error_t *
 stream_malformed (void)
 {
   return svn_error_create (SVN_ERR_STREAM_MALFORMED_DATA, NULL,
- "Dumpstream data appears to be malformed.");
+ "Dumpstream data appears to be malformed");
 }
 
 /* Read CONTENT_LENGTH bytes from STREAM, parsing the bytes as an
@@ -193,7 +193,7 @@
              but better to give a non-generic property block error. */
           return svn_error_create
             (SVN_ERR_STREAM_MALFORMED_DATA, NULL,
- "incomplete or unterminated property block");
+ "Incomplete or unterminated property block");
         }
 
       content_length -= (strbuf->len + 1); /* +1 because we read a \n too. */
@@ -367,13 +367,13 @@
                   SVN_REPOS_DUMPFILE_MAGIC_HEADER,
                   magic_len))
     return svn_error_create (SVN_ERR_STREAM_MALFORMED_DATA, NULL,
- "malformed dumpfile header.");
+ "Malformed dumpfile header");
 
   value = atoi (p+1);
 
   if (value > SVN_REPOS_DUMPFILE_FORMAT_VERSION)
     return svn_error_createf (SVN_ERR_STREAM_MALFORMED_DATA, NULL,
- "unsupported dumpfile version: %d",
+ "Unsupported dumpfile version: %d",
                               value);
 
   *version = value;
@@ -495,7 +495,7 @@
         {
           /* What the heck is this record?!? */
           return svn_error_create (SVN_ERR_STREAM_MALFORMED_DATA, NULL,
- "Unrecognized record type in stream.");
+ "Unrecognized record type in stream");
         }
       
       /* Is there a props content-block to parse? */
@@ -716,8 +716,8 @@
 
       if (! SVN_IS_VALID_REVNUM(src_rev))
         return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, NULL,
- "Relative copyfrom_rev %" SVN_REVNUM_T_FMT
- " is not available in current repository.",
+ "Relative source revision %" SVN_REVNUM_T_FMT
+ " is not available in current repository",
                                   src_rev);
 
       SVN_ERR (svn_fs_revision_root (&copy_root, pb->fs, src_rev, pool));
@@ -805,7 +805,7 @@
       }
     default:
       return svn_error_createf (SVN_ERR_STREAM_UNRECOGNIZED_DATA, NULL,
- "Unrecognized node-action on node '%s'.",
+ "Unrecognized node-action on node '%s'",
                                 nb->path);
     }
 
Index: subversion/libsvn_repos/fs-wrap.c
===================================================================
--- subversion/libsvn_repos/fs-wrap.c (revision 8012)
+++ subversion/libsvn_repos/fs-wrap.c (working copy)
@@ -51,7 +51,7 @@
   if ((err = svn_repos__hooks_post_commit (repos, *new_rev, pool)))
     return svn_error_create
       (SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED, err,
- "Commit succeeded, but post-commit hook failed.");
+ "Commit succeeded, but post-commit hook failed");
 
   return SVN_NO_ERROR;
 }
@@ -151,7 +151,7 @@
     return svn_error_createf
       (SVN_ERR_REPOS_BAD_ARGS, NULL,
        "Storage of non-regular property '%s' is disallowed through the "
- "repository interface, and could indicate a bug in your client.",
+ "repository interface, and could indicate a bug in your client",
        name);
   return SVN_NO_ERROR;
 }
Index: subversion/libsvn_repos/log.c
===================================================================
--- subversion/libsvn_repos/log.c (revision 8012)
+++ subversion/libsvn_repos/log.c (working copy)
@@ -159,11 +159,11 @@
   if (start > head)
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_REVISION, 0,
- "svn_repos_get_logs: No such revision '%" SVN_REVNUM_T_FMT "'", start);
+ "No such revision '%" SVN_REVNUM_T_FMT "'", start);
   if (end > head)
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_REVISION, 0,
- "svn_repos_get_logs: No such revision '%" SVN_REVNUM_T_FMT "'", end);
+ "No such revision '%" SVN_REVNUM_T_FMT "'", end);
 
   /* If paths were specified, then we only really care about revisions
      in which those paths were changed. So we ask the filesystem for
Index: subversion/libsvn_repos/reporter.c
===================================================================
--- subversion/libsvn_repos/reporter.c (revision 8012)
+++ subversion/libsvn_repos/reporter.c (working copy)
@@ -223,7 +223,7 @@
   if (! SVN_IS_VALID_REVNUM (revision))
     return svn_error_create
       (SVN_ERR_REPOS_BAD_REVISION_REPORT, NULL,
- "svn_repos_set_path: invalid revision passed to report.");
+ "Invalid revision passed to report");
 
   if (! SVN_IS_VALID_REVNUM (rbaton->txn_base_rev))
     {
@@ -232,7 +232,7 @@
       if (! svn_path_is_empty (path))
         return svn_error_create
           (SVN_ERR_REPOS_BAD_REVISION_REPORT, NULL,
- "svn_repos_set_path: initial revision report was bogus.");
+ "Initial revision report was bogus");
 
       /* Barring previous problems, squirrel away our based-on revision. */
       rbaton->txn_base_rev = revision;
@@ -439,8 +439,8 @@
   /* If nothing was described, then we have an error */
   if (! SVN_IS_VALID_REVNUM (rbaton->txn_base_rev))
     return svn_error_create (SVN_ERR_REPOS_NO_DATA_FOR_REPORT, NULL,
- "svn_repos_finish_report: no transaction was "
- "present, meaning no data was provided.");
+ "No transaction was "
+ "present, meaning no data was provided");
 
   /* Use the first transaction as a source if we made one, else get
      the root of the revision we would have based a transaction on. */
Index: subversion/libsvn_repos/hooks.c
===================================================================
--- subversion/libsvn_repos/hooks.c (revision 8012)
+++ subversion/libsvn_repos/hooks.c (working copy)
@@ -85,7 +85,7 @@
   if (err)
     {
       err = svn_error_createf
- (SVN_ERR_REPOS_HOOK_FAILURE, err, "failed to run '%s' hook", cmd);
+ (SVN_ERR_REPOS_HOOK_FAILURE, err, "Failed to run '%s' hook", cmd);
     }
 
   if (!err && check_exitcode)
@@ -258,7 +258,7 @@
         svn_error_create
         (SVN_ERR_REPOS_DISABLED_FEATURE, NULL,
          "Repository has not been enabled to accept revision propchanges;\n"
- "ask the administrator to create a pre-revprop-change hook.");
+ "ask the administrator to create a pre-revprop-change hook");
     }
 
   return SVN_NO_ERROR;
Index: subversion/libsvn_repos/node_tree.c
===================================================================
--- subversion/libsvn_repos/node_tree.c (revision 8012)
+++ subversion/libsvn_repos/node_tree.c (working copy)
@@ -234,7 +234,7 @@
   SVN_ERR (svn_fs_check_path (&kind, base_root, base_path, pool));
   if (kind == svn_node_none)
     return svn_error_createf (SVN_ERR_FS_NOT_FOUND, NULL,
- "'%s' not found in FS", path);
+ "'%s' not found in filesystem", path);
   node->kind = kind;
 
   return SVN_NO_ERROR;
Index: subversion/libsvn_repos/dump.c
===================================================================
--- subversion/libsvn_repos/dump.c (revision 8012)
+++ subversion/libsvn_repos/dump.c (working copy)
@@ -486,7 +486,7 @@
                      should never happen. */
                   return svn_error_createf
                     (SVN_ERR_STREAM_UNEXPECTED_EOF, NULL,
- "Error dumping textual contents of '%s'.", path);
+ "Error dumping textual contents of '%s'", path);
                 }
             }
         
@@ -877,13 +877,14 @@
   /* Validate the revisions. */
   if (start_rev > end_rev)
     return svn_error_createf (SVN_ERR_REPOS_BAD_ARGS, NULL,
- "start_rev %" SVN_REVNUM_T_FMT
- " is greater than end_rev %" SVN_REVNUM_T_FMT,
+ "Start revision %" SVN_REVNUM_T_FMT
+ " is greater than end revision %"
+ SVN_REVNUM_T_FMT,
                               start_rev, end_rev);
   if (end_rev > youngest)
     return svn_error_createf (SVN_ERR_REPOS_BAD_ARGS, NULL,
- "end_rev %" SVN_REVNUM_T_FMT " is invalid "
- "(youngest rev is %" SVN_REVNUM_T_FMT ")",
+ "End revision %" SVN_REVNUM_T_FMT " is invalid "
+ "(youngest revision is %" SVN_REVNUM_T_FMT ")",
                               end_rev, youngest);
   if ((start_rev == 0) && incremental)
     incremental = FALSE; /* revision 0 looks the same regardless of
Index: subversion/libsvn_repos/commit.c
===================================================================
--- subversion/libsvn_repos/commit.c (revision 8012)
+++ subversion/libsvn_repos/commit.c (working copy)
@@ -112,7 +112,7 @@
 out_of_date (const char *path, const char *txn_name)
 {
   return svn_error_createf (SVN_ERR_FS_TXN_OUT_OF_DATE, NULL,
- "out of date: '%s' in transaction '%s'",
+ "Out of date: '%s' in transaction '%s'",
                             path, txn_name);
 }
 
@@ -217,7 +217,7 @@
   if (copy_path && (! SVN_IS_VALID_REVNUM (copy_revision)))
     return svn_error_createf
       (SVN_ERR_FS_GENERAL, NULL,
- "add_dir '%s': got copy_path, but no copy_rev", full_path);
+ "Got source path but no source revision for '%s'", full_path);
 
   if (copy_path)
     {
@@ -241,7 +241,7 @@
       if (strncmp (copy_path, eb->repos_url, repos_url_len) != 0)
         return svn_error_createf
           (SVN_ERR_FS_GENERAL, NULL,
- "add_dir '%s': copy_url is from different repo", full_path);
+ "Source url '%s' is from different repository", full_path);
 
       fs_path = apr_pstrdup (subpool, copy_path + repos_url_len);
 
@@ -349,7 +349,7 @@
   if (copy_path && (! SVN_IS_VALID_REVNUM (copy_revision)))
     return svn_error_createf
       (SVN_ERR_FS_GENERAL, NULL,
- "add_file '%s': got copy_path, but no copy_rev", full_path);
+ "Got source path but no source revision for '%s'", full_path);
 
   if (copy_path)
     {
@@ -373,7 +373,7 @@
       if (strncmp (copy_path, eb->repos_url, repos_url_len) != 0)
             return svn_error_createf
               (SVN_ERR_FS_GENERAL, NULL,
- "add_file '%s': copy_url is from different repo", full_path);
+ "Source url '%s' is from different repository", full_path);
       
       fs_path = apr_pstrdup (subpool, copy_path + repos_url_len);
 
@@ -479,7 +479,7 @@
         {
           return svn_error_createf
             (SVN_ERR_CHECKSUM_MISMATCH, NULL,
- "close_file: checksum mismatch for resulting fulltext\n"
+ "Checksum mismatch for resulting fulltext\n"
              "(%s):\n"
              " expected checksum: %s\n"
              " actual checksum: %s\n",
Index: subversion/libsvn_repos/repos.c
===================================================================
--- subversion/libsvn_repos/repos.c (revision 8012)
+++ subversion/libsvn_repos/repos.c (working copy)
@@ -169,7 +169,7 @@
     "You should never have to edit or remove this file.\n";
 
   SVN_ERR_W (svn_io_file_create (lockfile_path, contents, pool),
- "creating db logs lock file");
+ "Creating db logs lock file");
 
   return SVN_NO_ERROR;
 }
@@ -194,7 +194,7 @@
       "You should never have to edit or remove this file.\n";
     
   SVN_ERR_W (svn_io_file_create (lockfile_path, contents, pool),
- "creating db lock file");
+ "Creating db lock file");
     
   return SVN_NO_ERROR;
 }
@@ -204,7 +204,7 @@
 {
   /* Create the locks directory. */
   SVN_ERR_W (create_repos_dir (repos->lock_path, pool),
- "creating lock dir");
+ "Creating lock dir");
 
   SVN_ERR (create_db_lock (repos, pool));
   SVN_ERR (create_db_logs_lock (repos, pool));
@@ -220,7 +220,7 @@
 
   /* Create the hook directory. */
   SVN_ERR_W (create_repos_dir (repos->hook_path, pool),
- "creating hook directory");
+ "Creating hook directory");
 
   /*** Write a default template for each standard hook file. */
 
@@ -315,7 +315,7 @@
       APR_EOL_STR;
 
     SVN_ERR_W (svn_io_file_create (this_path, contents, pool),
- "creating start-commit hook");
+ "Creating start-commit hook");
   } /* end start-commit hook */
 
   /* Pre-commit hook. */
@@ -437,7 +437,7 @@
       APR_EOL_STR;
     
     SVN_ERR_W (svn_io_file_create (this_path, contents, pool),
- "creating pre-commit hook");
+ "Creating pre-commit hook");
   } /* end pre-commit hook */
 
 
@@ -553,7 +553,7 @@
       APR_EOL_STR;
     
     SVN_ERR_W (svn_io_file_create (this_path, contents, pool),
- "creating pre-revprop-change hook");
+ "Creating pre-revprop-change hook");
   } /* end pre-revprop-change hook */
 
 
@@ -643,7 +643,7 @@
       APR_EOL_STR;
 
     SVN_ERR_W (svn_io_file_create (this_path, contents, pool),
- "creating post-commit hook");
+ "Creating post-commit hook");
   } /* end post-commit hook */
 
 
@@ -741,7 +741,7 @@
       APR_EOL_STR;
 
     SVN_ERR_W (svn_io_file_create (this_path, contents, pool),
- "creating post-revprop-change hook");
+ "Creating post-revprop-change hook");
   } /* end post-revprop-change hook */
 
   return SVN_NO_ERROR;
@@ -751,7 +751,7 @@
 create_conf (svn_repos_t *repos, apr_pool_t *pool)
 {
   SVN_ERR_W (create_repos_dir (repos->conf_path, pool),
- "creating conf directory");
+ "Creating conf directory");
 
   /* Write a default template for svnserve.conf. */
   {
@@ -807,7 +807,7 @@
 
     SVN_ERR_W (svn_io_file_create (svn_repos_svnserve_conf (repos, pool),
                                    svnserve_conf_contents, pool),
- "creating svnserve.conf file");
+ "Creating svnserve.conf file");
   }
 
   return SVN_NO_ERROR;
@@ -832,11 +832,11 @@
 {
   /* Create the top-level repository directory. */
   SVN_ERR_W (create_repos_dir (path, pool),
- "could not create top-level directory");
+ "Could not create top-level directory");
 
   /* Create the DAV sandbox directory. */
   SVN_ERR_W (create_repos_dir (repos->dav_path, pool),
- "creating DAV sandbox dir");
+ "Creating DAV sandbox dir");
 
   /* Create the lock directory. */
   SVN_ERR (create_locks (repos, pool));
@@ -874,7 +874,7 @@
       APR_EOL_STR;
 
     SVN_ERR_W (svn_io_file_create (readme_file_name, readme_contents, pool),
- "creating readme file");
+ "Creating readme file");
   }
 
   /* Write the top-level FORMAT file. */
@@ -905,7 +905,7 @@
 
   /* Create the various files and subdirectories for the repository. */
   SVN_ERR_W (create_repos_structure (repos, path, pool),
- "repository creation failed");
+ "Repository creation failed");
   
   /* Initialize the filesystem object. */
   repos->fs = svn_fs_new (fs_config, pool);
@@ -1016,7 +1016,7 @@
       exclusive = TRUE;
 
     SVN_ERR_W (svn_io_file_lock (lockfile_path, exclusive, pool),
- "get_repos: error opening db lockfile");
+ "Error opening db lockfile");
   }
 
   /* Open up the Berkeley filesystem only after obtaining the lock. */
Index: subversion/libsvn_repos/delta.c
===================================================================
--- subversion/libsvn_repos/delta.c (revision 8012)
+++ subversion/libsvn_repos/delta.c (working copy)
@@ -174,7 +174,7 @@
 
       if (! allowed)
         return svn_error_create (SVN_ERR_AUTHZ_ROOT_UNREADABLE, 0,
- "Unable to open root of edit.");
+ "Unable to open root of edit");
     }
 
   return SVN_NO_ERROR;
@@ -187,7 +187,7 @@
 {
   return svn_error_createf
     (SVN_ERR_FS_NOT_DIRECTORY, 0,
- "not_a_dir_error: invalid %s directory '%s'",
+ "Invalid %s directory '%s'",
      role, path ? path : "(null)");
 }
 
@@ -226,13 +226,13 @@
   /* TGT_FULLPATH must be valid. */
   if (! tgt_fullpath)
     return svn_error_create (SVN_ERR_FS_PATH_SYNTAX, 0,
- "svn_repos_dir_delta: invalid target path");
+ "Invalid target path");
 
   /* If SRC_ENTRY is supplied, it must not be empty. */
   if (src_entry && svn_path_is_empty (src_entry))
     return svn_error_create
       (SVN_ERR_FS_PATH_SYNTAX, 0,
- "svn_repos_dir_delta: source entry may not be the empty string");
+ "Source entry may not be the empty string");
 
   /* Calculate the fs path implicitly used for editor->open_root, so
      we can do an authz check on that path first. */
@@ -259,7 +259,7 @@
                         || tgt_kind != svn_node_dir))
     return svn_error_create
       (SVN_ERR_FS_PATH_SYNTAX, 0,
- "svn_repos_dir_delta: invalid editor anchoring; at least one of the "
+ "Invalid editor anchoring; at least one of the "
        "input paths is not a directory and there was no source entry");
   
   /* Set the global target revision if one can be determined. */
Index: subversion/libsvn_repos/rev_hunt.c
===================================================================
--- subversion/libsvn_repos/rev_hunt.c (revision 8012)
+++ subversion/libsvn_repos/rev_hunt.c (working copy)
@@ -56,7 +56,7 @@
   if (! date_str)
     return svn_error_createf
       (SVN_ERR_FS_GENERAL, NULL,
- "failed to find tm on revision %" SVN_REVNUM_T_FMT, rev);
+ "Failed to find time on revision %" SVN_REVNUM_T_FMT, rev);
 
   SVN_ERR (svn_time_from_cstring (tm, date_str->data, pool));
 
@@ -191,12 +191,12 @@
   if (! SVN_IS_VALID_REVNUM (start))
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_REVISION, 0,
- "svn_repos_revisions_changed: invalid start revision %"
+ "Invalid start revision %"
        SVN_REVNUM_T_FMT, start);
   if (! SVN_IS_VALID_REVNUM (end))
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_REVISION, 0,
- "svn_repos_revisions_changed: invalid end revision %"
+ "Invalid end revision %"
        SVN_REVNUM_T_FMT, end);
 
   /* Ensure that the input is ordered. */
Index: subversion/libsvn_ra_svn/client.c
===================================================================
--- subversion/libsvn_ra_svn/client.c (revision 8012)
+++ subversion/libsvn_ra_svn/client.c (working copy)
@@ -416,7 +416,7 @@
 
   if (!val || !*val)
     return svn_error_createf(SVN_ERR_BAD_URL, NULL,
- "Undefined tunnel scheme %s", tunnel);
+ "Undefined tunnel scheme '%s'", tunnel);
 
   /* If the scheme definition begins with "$varname", it means there
    * is an environment variable which can override the command. */
@@ -804,7 +804,7 @@
       if (strcmp(hex_digest, expected_checksum) != 0)
         return svn_error_createf
           (SVN_ERR_CHECKSUM_MISMATCH, NULL,
- "ra_svn_get_file: checksum mismatch for '%s':\n"
+ "Checksum mismatch for '%s':\n"
            " expected checksum: %s\n"
            " actual checksum: %s\n",
            path, expected_checksum, hex_digest);
Index: subversion/libsvn_ra_svn/editorp.c
===================================================================
--- subversion/libsvn_ra_svn/editorp.c (revision 8012)
+++ subversion/libsvn_ra_svn/editorp.c (working copy)
@@ -592,7 +592,7 @@
   SVN_ERR(lookup_token(ds, token, TRUE, &entry));
   if (entry->dstream)
     return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "apply-textdelta already active");
+ "Apply-textdelta already active");
   SVN_CMD_ERR(ds->editor->apply_textdelta(entry->baton, base_checksum,
                                           entry->pool, &wh, &wh_baton));
   entry->dstream = svn_txdelta_parse_svndiff(wh, wh_baton, TRUE, entry->pool);
@@ -613,7 +613,7 @@
   SVN_ERR(lookup_token(ds, token, TRUE, &entry));
   if (!entry->dstream)
     return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "apply-textdelta not active");
+ "Apply-textdelta not active");
   SVN_CMD_ERR(svn_stream_write(entry->dstream, str->data, &str->len));
   return SVN_NO_ERROR;
 }
@@ -631,7 +631,7 @@
   SVN_ERR(lookup_token(ds, token, TRUE, &entry));
   if (!entry->dstream)
     return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
- "apply-textdelta not active");
+ "Apply-textdelta not active");
   SVN_CMD_ERR(svn_stream_close(entry->dstream));
   entry->dstream = NULL;
   return SVN_NO_ERROR;
Index: subversion/libsvn_delta/svndiff.c
===================================================================
--- subversion/libsvn_delta/svndiff.c (revision 8012)
+++ subversion/libsvn_delta/svndiff.c (working copy)
@@ -332,19 +332,19 @@
           if (p == NULL)
             return svn_error_createf
               (SVN_ERR_SVNDIFF_INVALID_OPS, NULL,
- "insn %d cannot be decoded", n);
+ "Invalid diff stream: insn %d cannot be decoded", n);
           else if (op.offset < 0)
             return svn_error_createf
               (SVN_ERR_SVNDIFF_INVALID_OPS, NULL,
- "insn %d has negative offset", n);
+ "Invalid diff stream: insn %d has negative offset", n);
           else if (op.length <= 0)
             return svn_error_createf
               (SVN_ERR_SVNDIFF_INVALID_OPS, NULL,
- "insn %d has non-positive length", n);
+ "Invalid diff stream: insn %d has non-positive length", n);
           else
             return svn_error_createf
               (SVN_ERR_SVNDIFF_INVALID_OPS, NULL,
- "insn %d overflows the target view", n);
+ "Invalid diff stream: insn %d overflows the target view", n);
         }
 
       switch (op.action_code)
@@ -353,18 +353,21 @@
           if (op.length > sview_len - op.offset)
             return svn_error_createf
               (SVN_ERR_SVNDIFF_INVALID_OPS, NULL,
+ "Invalid diff stream: "
                "[src] insn %d overflows the source view", n);
           break;
         case svn_txdelta_target:
           if (op.offset >= tpos)
             return svn_error_createf
               (SVN_ERR_SVNDIFF_INVALID_OPS, NULL,
+ "Invalid diff stream: "
                "[tgt] insn %d starts beyond the target view position", n);
           break;
         case svn_txdelta_new:
           if (op.length > new_len - npos)
             return svn_error_createf
               (SVN_ERR_SVNDIFF_INVALID_OPS, NULL,
+ "Invalid diff stream: "
                "[new] insn %d overflows the new data section", n);
           npos += op.length;
           break;
@@ -374,10 +377,10 @@
     }
   if (tpos != tview_len)
     return svn_error_create (SVN_ERR_SVNDIFF_INVALID_OPS, NULL,
- "delta does not fill the target window");
+ "Delta does not fill the target window");
   if (npos != new_len)
     return svn_error_create (SVN_ERR_SVNDIFF_INVALID_OPS, NULL,
- "delta does not contain enough new data");
+ "Delta does not contain enough new data");
 
   *ninst = n;
   return SVN_NO_ERROR;
@@ -404,7 +407,7 @@
         nheader = buflen;
       if (memcmp (buffer, "SVN\0" + db->header_bytes, nheader) != 0)
         return svn_error_create (SVN_ERR_SVNDIFF_INVALID_HEADER, NULL,
- "svndiff has invalid header");
+ "Svndiff has invalid header");
       buflen -= nheader;
       buffer += nheader;
       db->header_bytes += nheader;
@@ -468,7 +471,7 @@
       if (sview_offset < 0 || sview_len < 0 || tview_len < 0 || inslen < 0
           || newlen < 0 || inslen + newlen < 0 || sview_offset + sview_len < 0)
         return svn_error_create (SVN_ERR_SVNDIFF_CORRUPT_WINDOW, NULL,
- "svndiff contains corrupt window header");
+ "Svndiff contains corrupt window header");
 
       /* Check for source windows which slide backwards. */
       if (sview_len > 0
@@ -476,7 +479,7 @@
               || (sview_offset + sview_len
                   < db->last_sview_offset + db->last_sview_len)))
         return svn_error_create (SVN_ERR_SVNDIFF_BACKWARD_VIEW, NULL,
- "svndiff has backwards-sliding source views");
+ "Svndiff has backwards-sliding source views");
 
       /* Wait for more data if we don't have enough bytes for the
          whole window. */
@@ -557,7 +560,7 @@
   if ((db->error_on_early_close)
       && (db->header_bytes < 4 || db->buffer->len != 0))
     return svn_error_create (SVN_ERR_SVNDIFF_UNEXPECTED_END, NULL,
- "unexpected end of svndiff input");
+ "Unexpected end of svndiff input");
 
   /* Tell the window consumer that we're done, and clean up. */
   err = db->consumer_func (NULL, db->consumer_baton);
Index: subversion/libsvn_ra_dav/merge.c
===================================================================
--- subversion/libsvn_ra_dav/merge.c (revision 8012)
+++ subversion/libsvn_ra_dav/merge.c (working copy)
@@ -213,7 +213,7 @@
       return svn_error_createf(APR_EGENERAL, NULL,
                                "Protocol error: we told the server to not "
                                "auto-merge any resources, but it said that "
- "\"%s\" was merged.", mc->href->data);
+ "'%s' was merged", mc->href->data);
     }
   if (mc->response_parent != ELEM_updated_set)
     {
@@ -221,8 +221,8 @@
       /* ### need something better than APR_EGENERAL */
       return svn_error_createf(APR_EGENERAL, NULL,
                                "Internal error: there is an unknown parent "
- "(%d) for the DAV:response element within the "
- "MERGE response", mc->response_parent);
+ "(%d) for the 'DAV:response' element within the"
+ " MERGE response", mc->response_parent);
     }
 #if 0
   /* ### right now, the server isn't sending everything for all resources.
@@ -236,7 +236,7 @@
          resource. */
       return svn_error_createf(APR_EGENERAL, NULL,
                                "Protocol error: the MERGE response for the "
- "\"%s\" resource did not return all of the "
+ "'%s' resource did not return all of the "
                                "properties that we asked for (and need to "
                                "complete the commit).", mc->href->data);
     }
@@ -254,8 +254,8 @@
     {
       /* ### need something better than APR_EGENERAL */
       return svn_error_createf(APR_EGENERAL, NULL,
- "A MERGE response for \"%s\" is not a child "
- "of the destination (\"%s\")",
+ "A MERGE response for '%s' is not a child "
+ "of the destination ('%s')",
                                mc->href->data, mc->base_href);
     }
 
@@ -476,7 +476,7 @@
             /* ### fix this error value */
             mc->err = svn_error_create(APR_EGENERAL, NULL,
                                        "The MERGE property response had an "
- "error status.");
+ "error status");
           }
       }
       break;
Index: subversion/libsvn_ra_dav/props.c
===================================================================
--- subversion/libsvn_ra_dav/props.c (revision 8012)
+++ subversion/libsvn_ra_dav/props.c (working copy)
@@ -578,7 +578,7 @@
     {
       /* ### hmmm, should have been in there... */
       return svn_error_createf(APR_EGENERAL, NULL,
- "failed to find label \"%s\" for URL \"%s\"",
+ "Failed to find label '%s' for URL '%s'",
                                label ? label : "NULL", url_path);
     }
 
@@ -607,7 +607,7 @@
     {
       /* ### need an SVN_ERR here */
       return svn_error_createf(SVN_ERR_RA_DAV_PROPS_NOT_FOUND, NULL,
- "'%s' was not present on the resource.", name);
+ "'%s' was not present on the resource", name);
     }
 
   *propval = value;
@@ -680,7 +680,7 @@
     {
       err = svn_error_createf (SVN_ERR_RA_ILLEGAL_URL, NULL,
                                "No part of path '%s' was found in "
- "repository HEAD.", parsed_url.path);
+ "repository HEAD", parsed_url.path);
       goto error;
     }
 
@@ -714,7 +714,7 @@
   if (! vcc_s)
     return svn_error_create(APR_EGENERAL, NULL,
                              "The VCC property was not found on the "
- "resource.");
+ "resource");
 
   *vcc = vcc_s->data;
   return SVN_NO_ERROR;
@@ -769,7 +769,7 @@
       /* ### need an SVN_ERR here */
       return svn_error_create(APR_EGENERAL, NULL,
                               "The VCC property was not found on the "
- "resource.");
+ "resource");
     }
 
   /* Allocate our own bc_relative path. */
@@ -782,7 +782,7 @@
       /* ### need an SVN_ERR here */
       return svn_error_create(APR_EGENERAL, NULL,
                               "The relative-path property was not "
- "found on the resource.");
+ "found on the resource");
     }
     
   /* don't forget to tack on the parts we lopped off in order
@@ -899,8 +899,8 @@
       /* ### better error reporting... */
       /* ### need an SVN_ERR here */
       return svn_error_create(APR_EGENERAL, NULL,
- "DAV:baseline-collection was not present "
- "on the baseline resource.");
+ "'DAV:baseline-collection' was not present "
+ "on the baseline resource");
     }
 
   /* maybe return bc_url to the caller */
@@ -918,8 +918,8 @@
 
           /* ### need an SVN_ERR here */
           return svn_error_create(APR_EGENERAL, NULL,
- "DAV:version-name was not present on the "
- "baseline resource.");
+ "'DAV:version-name' was not present on the "
+ "baseline resource");
         }
       *latest_rev = SVN_STR_TO_REV(vsn_name->data);
     }
@@ -1071,7 +1071,7 @@
          entire 'commit' is rejected. */
       err = svn_error_create
         (SVN_ERR_RA_DAV_PROPPATCH_FAILED, NULL,
- "At least one property change failed; repository is unchanged.");
+ "At least one property change failed; repository is unchanged");
     }
 
   ne_buffer_destroy(body);
Index: subversion/libsvn_ra_dav/session.c
===================================================================
--- subversion/libsvn_ra_dav/session.c (revision 8012)
+++ subversion/libsvn_ra_dav/session.c (working copy)
@@ -563,7 +563,7 @@
     {
       ne_uri_free(&uri);
       return svn_error_create(SVN_ERR_RA_DAV_SOCK_INIT, NULL,
- "network socket initialization failed");
+ "Network socket initialization failed");
     }
 
   /* we want to know if the repository is actually somewhere else */
Index: subversion/libsvn_ra_dav/commit.c
===================================================================
--- subversion/libsvn_ra_dav/commit.c (revision 8012)
+++ subversion/libsvn_ra_dav/commit.c (working copy)
@@ -245,7 +245,7 @@
       return svn_error_create(APR_EGENERAL, NULL,
                               "Could not fetch the Version Resource URL "
                               "(needed during an import or when it is "
- "missing from the local, cached props).");
+ "missing from the local, cached props)");
     }
 
   /* ensure we get the proper lifetime for this URL since it is going into
@@ -485,7 +485,7 @@
       if (err->apr_err == SVN_ERR_FS_CONFLICT)
         return svn_error_createf
           (err->apr_err, err,
- "Your file or directory '%s' is probably out-of-date.",
+ "Your file or directory '%s' is probably out-of-date",
            rsrc->local_path);
       return err;
     }
@@ -494,7 +494,7 @@
   if (locn == NULL)
     return svn_error_create(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
                             "The CHECKOUT response did not contain a "
- "Location: header.");
+ "'Location:' header");
 
   /* The location is an absolute URI. We want just the path portion. */
   /* ### what to do with the rest? what if it points somewhere other
@@ -864,7 +864,7 @@
         {
           /* If the PROPFIND succeeds the file already exists */
           return svn_error_createf(SVN_ERR_RA_DAV_ALREADY_EXISTS, NULL,
- "file '%s' already exists", file->rsrc->url);
+ "File '%s' already exists", file->rsrc->url);
         }
       else if (err->apr_err == SVN_ERR_RA_DAV_PATH_NOT_FOUND)
         {
Index: subversion/libsvn_ra_dav/fetch.c
===================================================================
--- subversion/libsvn_ra_dav/fetch.c (revision 8012)
+++ subversion/libsvn_ra_dav/fetch.c (working copy)
@@ -251,7 +251,7 @@
   /* store the version URL as a property */
   SVN_ERR_W( (*setter)(baton, SVN_RA_DAV__LP_VSN_URL,
                        svn_string_create(vsn_url, pool), pool),
- "could not save the URL of the version resource" );
+ "Could not save the URL of the version resource" );
 
   return NULL;
 }
@@ -555,7 +555,7 @@
 #if 0
       if (written != len && cgc->err == NULL)
         cgc->err = svn_error_createf(SVN_ERR_INCOMPLETE_DATA, NULL,
- "unable to completely write the svndiff "
+ "Unable to completely write the svndiff "
                                      "data to the parser stream "
                                      "(wrote " APR_SIZE_T_FMT " "
                                      "of " APR_SIZE_T_FMT " bytes)",
@@ -582,7 +582,7 @@
                                         pool,
                                         &frc.handler,
                                         &frc.handler_baton),
- "could not save file");
+ "Could not save file");
 
   /* Only bother with text-deltas if our caller cares. */
   if (! text_deltas)
@@ -630,7 +630,7 @@
       /* Uh oh, didn't write as many bytes as neon gave us. */
       return
         svn_error_create(SVN_ERR_STREAM_UNEXPECTED_EOF, NULL,
- "Error writing to svn_stream: unexpected EOF");
+ "Error writing to stream: unexpected EOF");
     }
 #endif
       
@@ -815,7 +815,7 @@
           if (strcmp (hex_digest, expected_checksum->data) != 0)
             return svn_error_createf
               (SVN_ERR_CHECKSUM_MISMATCH, NULL,
- "svn_ra_dav__get_file: checksum mismatch for '%s':\n"
+ "Checksum mismatch for '%s':\n"
                " expected checksum: %s\n"
                " actual checksum: %s\n",
                path, expected_checksum->data, hex_digest);
@@ -1077,13 +1077,13 @@
                                           revision, NULL, NULL, pool);
   if (err && err->apr_err == SVN_ERR_UNSUPPORTED_FEATURE)
     return svn_error_quick_wrap(err, "Server does not support date-based "
- "operations.");
+ "operations");
   else if (err)
     return err;
 
   if (*revision == SVN_INVALID_REVNUM)
     return svn_error_create(SVN_ERR_INCOMPLETE_DATA, NULL,
- "Invalid server response to dated-rev request.");
+ "Invalid server response to dated-rev request");
 
   return SVN_NO_ERROR;
 }
Index: subversion/libsvn_ra_dav/options.c
===================================================================
--- subversion/libsvn_ra_dav/options.c (revision 8012)
+++ subversion/libsvn_ra_dav/options.c (working copy)
@@ -128,9 +128,9 @@
       /* ### error */
       return svn_error_create(SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED, NULL,
                               "The OPTIONS response did not include the "
- "requested activity-collection-set.\n"
- "(Check the URL again; this often means that "
- "the URL is not WebDAV-enabled.)");
+ "requested activity-collection-set; "
+ "this often means that "
+ "the URL is not WebDAV-enabled");
     }
 
   *activity_coll = oc.activity_coll;
Index: subversion/libsvn_ra_dav/util.c
===================================================================
--- subversion/libsvn_ra_dav/util.c (revision 8012)
+++ subversion/libsvn_ra_dav/util.c (working copy)
@@ -646,7 +646,7 @@
     {
       err = svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
                               "The %s request returned invalid XML "
- "in the response: %s. (%s)",
+ "in the response: %s (%s)",
                               method, msg, url);
       goto cleanup;
     }
Index: subversion/svnserve/serve.c
===================================================================
--- subversion/svnserve/serve.c (revision 8012)
+++ subversion/svnserve/serve.c (working copy)
@@ -87,7 +87,7 @@
   len = strlen(repos_url);
   if (strncmp(url, repos_url, len) != 0)
     return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
- "'%s'\nis not the same repository as\n'%s'",
+ "'%s' is not the same repository as '%s'",
                              url, repos_url);
   *fs_path = url + len;
   return SVN_NO_ERROR;
@@ -993,7 +993,7 @@
 
   if(apr_err)
     return svn_error_create(SVN_ERR_BAD_FILENAME, NULL,
- "Couldn't determine repository path.");
+ "Couldn't determine repository path");
 
   SVN_ERR(svn_path_cstring_to_utf8(&full_path, buffer, pool));
   full_path = svn_path_canonicalize(full_path, pool);

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Dec 16 18:11:19 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.