You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/03/08 11:27:54 UTC
svn commit: r1298343 - /subversion/trunk/subversion/mod_dav_svn/version.c
Author: philip
Date: Thu Mar 8 10:27:54 2012
New Revision: 1298343
URL: http://svn.apache.org/viewvc?rev=1298343&view=rev
Log:
* subversion/mod_dav_svn/version.c
(merge): Return an error when resource does not exist.
Modified:
subversion/trunk/subversion/mod_dav_svn/version.c
Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1298343&r1=1298342&r2=1298343&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Thu Mar 8 10:27:54 2012
@@ -1382,6 +1382,15 @@ merge(dav_resource *target,
SVN_DAV_ERROR_NAMESPACE,
SVN_DAV_ERROR_TAG);
}
+ if (! source->exists)
+ {
+ return dav_svn__new_error_tag(pool, HTTP_METHOD_NOT_ALLOWED,
+ SVN_ERR_INCORRECT_PARAMS,
+ "MERGE activity or transaction resource "
+ "does not exist.",
+ SVN_DAV_ERROR_NAMESPACE,
+ SVN_DAV_ERROR_TAG);
+ }
/* Before attempting the final commit, we need to push any incoming
lock-tokens into the filesystem's access_t. Normally they come