Inspired by a few recent messages on the users@ list that pointed out
typos in error messages, I went and found a few more:
Log:
Fix typos in error messages.
Patch by Michael W Thelen <thelenm@cs.utah.edu>, including one typo noticed by
Dylan McNamee <dylan@exanetworks.com>.
* subversion/libsvn_fs_base/dag.c,
subversion/libsvn_client/commit_util.c,
subversion/svnlook/main.c,
subversion/mod_dav_svn/log.c,
subversion/mod_dav_svn/version.c,
subversion/mod_dav_svn/util.c,
subversion/libsvn_ra_dav/merge.c,
subversion/libsvn_fs_fs/fs_fs.c,
subversion/libsvn_fs_fs/dag.c: Fix typos in error messages.
Index: subversion/libsvn_fs_base/dag.c
===================================================================
--- subversion/libsvn_fs_base/dag.c (revision 9929)
+++ subversion/libsvn_fs_base/dag.c (working copy)
@@ -1409,7 +1409,7 @@
if (! node_id)
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
- "Attempted to open non-existant child node '%s'", name);
+ "Attempted to open non-existent child node '%s'", name);
/* Make sure that NAME is a single path component. */
if (! svn_path_is_single_path_component (name))
Index: subversion/libsvn_client/commit_util.c
===================================================================
--- subversion/libsvn_client/commit_util.c (revision 9929)
+++ subversion/libsvn_client/commit_util.c (working copy)
@@ -641,7 +641,7 @@
return svn_error_createf
(SVN_ERR_ILLEGAL_TARGET, NULL,
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
- "for addition. Perhaps you're committing a target that this\n"
+ "for addition. Perhaps you're committing a target that is\n"
"inside of an unversioned (or not-yet-versioned) directory?",
target);
Index: subversion/svnlook/main.c
===================================================================
--- subversion/svnlook/main.c (revision 9929)
+++ subversion/svnlook/main.c (working copy)
@@ -1893,7 +1893,7 @@
SVN_INT_ERR (svn_error_create
(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
_("The '--transaction' (-t) and '--revision' (-r) arguments "
- "can not co-exist")));
+ "cannot 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/mod_dav_svn/log.c
===================================================================
--- subversion/mod_dav_svn/log.c (revision 9929)
+++ subversion/mod_dav_svn/log.c (working copy)
@@ -309,7 +309,7 @@
if ((serr = maybe_send_header(&lrb)))
{
derr = dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "Error beginning REPORT reponse.",
+ "Error beginning REPORT response.",
resource->pool);
goto cleanup;
}
@@ -317,7 +317,7 @@
if ((serr = send_xml(&lrb, "</S:log-report>" DEBUG_CR)))
{
derr = dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "Error ending REPORT reponse.",
+ "Error ending REPORT response.",
resource->pool);
goto cleanup;
}
Index: subversion/mod_dav_svn/version.c
===================================================================
--- subversion/mod_dav_svn/version.c (revision 9929)
+++ subversion/mod_dav_svn/version.c (working copy)
@@ -308,7 +308,7 @@
{
return dav_new_error_tag(resource->pool, HTTP_NOT_IMPLEMENTED,
SVN_ERR_UNSUPPORTED_FEATURE,
- "CHECKOUT can not create an activity at this "
+ "CHECKOUT cannot create an activity at this "
"time. Use MKACTIVITY first.",
SVN_DAV_ERROR_NAMESPACE,
SVN_DAV_ERROR_TAG);
Index: subversion/mod_dav_svn/util.c
===================================================================
--- subversion/mod_dav_svn/util.c (revision 9929)
+++ subversion/mod_dav_svn/util.c (working copy)
@@ -242,7 +242,7 @@
|| memcmp(path, relative->info->repos->root_path, len2) != 0)
{
return svn_error_create(SVN_ERR_APMOD_MALFORMED_URI, NULL,
- "Ununsable URI: it does not refer to this "
+ "Unusable URI: it does not refer to this "
"repository");
}
Index: subversion/libsvn_ra_dav/merge.c
===================================================================
--- subversion/libsvn_ra_dav/merge.c (revision 9929)
+++ subversion/libsvn_ra_dav/merge.c (working copy)
@@ -213,7 +213,7 @@
/* ### shouldn't have happened. we told the server "don't merge" */
/* ### need something better than APR_EGENERAL */
return svn_error_createf(APR_EGENERAL, NULL,
- _("Protocol error: we told the server to not "
+ _("Protocol error: we told the server not to "
"auto-merge any resources, but it said that "
"'%s' was merged"), mc->href->data);
}
Index: subversion/libsvn_fs_fs/fs_fs.c
===================================================================
--- subversion/libsvn_fs_fs/fs_fs.c (revision 9929)
+++ subversion/libsvn_fs_fs/fs_fs.c (working copy)
@@ -1327,7 +1327,7 @@
if (! rb->src_state)
return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
"svndiff data requested "
- "non-existant source.");
+ "non-existent source.");
rs = rb->src_state;
sbuf = apr_pcalloc (rb->pool, window->sview_len);
if (! ((rs->start + window->sview_offset) < rs->end))
Index: subversion/libsvn_fs_fs/dag.c
===================================================================
--- subversion/libsvn_fs_fs/dag.c (revision 9929)
+++ subversion/libsvn_fs_fs/dag.c (working copy)
@@ -957,7 +957,7 @@
if (! node_id)
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
- "Attempted to open non-existant child node '%s'", name);
+ "Attempted to open non-existent child node '%s'", name);
/* Make sure that NAME is a single path component. */
if (! svn_path_is_single_path_component (name))
--
Michael W. Thelen
Never attribute to malice what can be adequately explained by stupidity.
-- Nick Diamos
Received on Fri Jun 4 08:17:29 2004