You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/10/10 21:41:23 UTC
svn commit: r1181169 -
/subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
Author: hwright
Date: Mon Oct 10 19:41:22 2011
New Revision: 1181169
URL: http://svn.apache.org/viewvc?rev=1181169&view=rev
Log:
* subversion/mod_dav_svn/repos.c:
Revert changes accidentally committed in r1181166.
Modified:
subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
Modified: subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c?rev=1181169&r1=1181168&r2=1181169&view=diff
==============================================================================
--- subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c Mon Oct 10 19:41:22 2011
@@ -2649,11 +2649,10 @@ deliver(const dav_resource *resource, ap
apr_status_t status;
/* Check resource type */
- if (resource->baselined
- || (resource->type != DAV_RESOURCE_TYPE_REGULAR
- && resource->type != DAV_RESOURCE_TYPE_VERSION
- && resource->type != DAV_RESOURCE_TYPE_WORKING
- && resource->info->restype != DAV_SVN_RESTYPE_PARENTPATH_COLLECTION))
+ if (resource->type != DAV_RESOURCE_TYPE_REGULAR
+ && resource->type != DAV_RESOURCE_TYPE_VERSION
+ && resource->type != DAV_RESOURCE_TYPE_WORKING
+ && resource->info->restype != DAV_SVN_RESTYPE_PARENTPATH_COLLECTION)
{
return dav_new_error(resource->pool, HTTP_CONFLICT, 0,
"Cannot GET this type of resource.");