Author: svn-role
Date: Fri Apr 13 04:01:09 2012
New Revision: 1325602
URL: http://svn.apache.org/viewvc?rev=1325602&view=rev
Log:
Merge r1298343 from trunk:
* r1298343
Return an error when attempting to MERGE a resource that does not exist.
Justification:
Avoid asserting.
Votes:
+1: philip, stsp, hwright
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/mod_dav_svn/version.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1298343
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1325602&r1=1325601&r2=1325602&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Apr 13 04:01:09 2012
@@ -144,13 +144,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1298343
- Return an error when attempting to MERGE a resource that does not exist.
- Justification:
- Avoid asserting.
- Votes:
- +1: philip, stsp, hwright
-
* r1310535, r1310594
Handle APR Hash order changes in Ruby bindings test expectations.
Justification:
Modified: subversion/branches/1.7.x/subversion/mod_dav_svn/version.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/mod_dav_svn/version.c?rev=1325602&r1=1325601&r2=1325602&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/mod_dav_svn/version.c (original)
+++ subversion/branches/1.7.x/subversion/mod_dav_svn/version.c Fri Apr 13
04:01:09 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
