Author: danielsh
Date: Tue May 7 21:15:15 2013
New Revision: 1480084
URL: http://svn.apache.org/r1480084
Log:
Merge r1480082 from trunk onto 1.8.x: error string fixes.
Approved by: breser
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/subversion/include/svn_error_codes.h
subversion/branches/1.8.x/subversion/libsvn_client/add.c
subversion/branches/1.8.x/subversion/libsvn_client/merge.c
subversion/branches/1.8.x/subversion/libsvn_client/ra.c
subversion/branches/1.8.x/subversion/libsvn_ra_serf/serf.c
subversion/branches/1.8.x/subversion/libsvn_subr/cache-membuffer.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1480082
Modified: subversion/branches/1.8.x/subversion/include/svn_error_codes.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/include/svn_error_codes.h?rev=1480084&r1=1480083&r2=1480084&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/include/svn_error_codes.h (original)
+++ subversion/branches/1.8.x/subversion/include/svn_error_codes.h Tue May 7
21:15:15 2013
@@ -1275,7 +1275,7 @@ SVN_ERROR_START
/** @since New in 1.6. */
SVN_ERRDEF(SVN_ERR_NO_APR_MEMCACHE,
SVN_ERR_MISC_CATEGORY_START + 28,
- "apr memcache library not available")
+ "APR memcache library not available")
/** @since New in 1.6. */
SVN_ERRDEF(SVN_ERR_ATOMIC_INIT_FAILURE,
Modified: subversion/branches/1.8.x/subversion/libsvn_client/add.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/add.c?rev=1480084&r1=1480083&r2=1480084&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/add.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/add.c Tue May 7
21:15:15 2013
@@ -1131,7 +1131,7 @@ mkdir_urls(const apr_array_header_t *url
if (*bname == '\0')
return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
- _("There is no valid uri above '%s'"),
+ _("There is no valid URI above '%s'"),
common);
}
else
@@ -1158,7 +1158,7 @@ mkdir_urls(const apr_array_header_t *url
if (*bname == '\0')
return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
- _("There is no valid uri above '%s'"),
+ _("There is no valid URI above '%s'"),
common);
for (i = 0; i < targets->nelts; i++)
Modified: subversion/branches/1.8.x/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/merge.c?rev=1480084&r1=1480083&r2=1480084&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/merge.c Tue May 7
21:15:15 2013
@@ -436,7 +436,7 @@ check_repos_match(const merge_target_t *
if (!svn_uri__is_ancestor(target->loc.repos_root_url, url))
return svn_error_createf(
SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- _("Url '%s' of '%s' is not in repository '%s'"),
+ _("URL '%s' of '%s' is not in repository '%s'"),
url, svn_dirent_local_style(local_abspath, scratch_pool),
target->loc.repos_root_url);
@@ -6229,7 +6229,7 @@ get_wc_explicit_mergeinfo_catalog(apr_ha
err = svn_error_createf(
SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING, err,
_("Invalid mergeinfo detected on '%s', "
- "mergetracking not possible"),
+ "merge tracking not possible"),
svn_dirent_local_style(wc_path, scratch_pool));
}
return svn_error_trace(err);
@@ -7378,7 +7378,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
err = svn_error_createf(
SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING, err,
_("Invalid mergeinfo detected on merge target '%s', "
- "mergetracking not possible"),
+ "merge tracking not possible"),
svn_dirent_local_style(target_abspath, scratch_pool));
}
return svn_error_trace(err);
Modified: subversion/branches/1.8.x/subversion/libsvn_client/ra.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/ra.c?rev=1480084&r1=1480083&r2=1480084&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/ra.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/ra.c Tue May 7 21:15:15
2013
@@ -158,7 +158,7 @@ push_wc_prop(void *baton,
if (! cb->commit_items)
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- _("Attempt to set wc property '%s' on '%s' in a non-commit operation"),
+ _("Attempt to set wcprop '%s' on '%s' in a non-commit operation"),
name, svn_dirent_local_style(relpath, pool));
for (i = 0; i < cb->commit_items->nelts; i++)
Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/serf.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/serf.c?rev=1480084&r1=1480083&r2=1480084&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/serf.c Tue May 7
21:15:15 2013
@@ -119,8 +119,9 @@ load_http_auth_types(apr_pool_t *pool, s
*authn_types |= SERF_AUTHN_NEGOTIATE;
else
return svn_error_createf(SVN_ERR_BAD_CONFIG_VALUE, NULL,
- _("Invalid config: unknown http auth"
- "type '%s'"), token);
+ _("Invalid config: unknown %s "
+ "'%s'"),
+ SVN_CONFIG_OPTION_HTTP_AUTH_TYPES, token);
}
}
else
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/cache-membuffer.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/cache-membuffer.c?rev=1480084&r1=1480083&r2=1480084&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/cache-membuffer.c
(original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/cache-membuffer.c Tue May
7 21:15:15 2013
@@ -1282,7 +1282,7 @@ svn_cache__membuffer_cache_create(svn_me
{
/* We are OOM. There is no need to proceed with "half a cache".
*/
- return svn_error_wrap_apr(APR_ENOMEM, _("OOM"));
+ return svn_error_wrap_apr(APR_ENOMEM, "OOM");
}
#if APR_HAS_THREADS
