Author: rhuijben
Date: Wed Jan 15 00:45:00 2014
New Revision: 1558247
URL: http://svn.apache.org/r1558247
Log:
Make some 'ra_dav' commit error messages for out of date cases match those
of the generic libsvn_repos commit logic. (See commit.c out_of_date())
* subversion/mod_dav_svn/repos.c
(do_out_of_date_check,
remove_resource): Select error message based on node type, like in the
libsvn_repos commit logic.
Modified:
subversion/trunk/subversion/mod_dav_svn/repos.c
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1558247&r1=1558246&r2=1558247&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Jan 15 00:45:00 2014
@@ -1795,7 +1795,11 @@ do_out_of_date_check(dav_resource_combin
if (comb->priv.version_name < created_rev)
{
serr = svn_error_createf(SVN_ERR_RA_OUT_OF_DATE, NULL,
- "Item '%s' is out of date",
+ comb->res.collection
+ ? "Directory '%s' is out of date"
+ : (comb->res.exists
+ ? "File '%s' is out of date"
+ : "'%s' is out of date"),
comb->priv.repos_path);
return dav_svn__convert_err(serr, HTTP_CONFLICT,
"Attempting to modify out-of-date resource.",
@@ -3946,7 +3950,11 @@ remove_resource(dav_resource *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",
+ resource->collection
+ ? "Directory '%s' is out of date"
+ : (resource->exists
+ ? "File '%s' is out of date"
+ : "'%s' is out of date"),
resource->info->repos_path);
return dav_svn__convert_err(serr, HTTP_CONFLICT,
"Can't DELETE out-of-date resource",
