Author: philip
Date: Thu May 5 18:42:46 2011
New Revision: 1099914
URL: http://svn.apache.org/viewvc?rev=1099914&view=rev
Log:
Fix authz_tests 18.
* subversion/libsvn_wc/copy.c
(copy_versioned_dir): Don't use SVN_ERR_MALFUNCTION on absent nodes
but allow svn_wc_db_op_copy to return an error instead.
Modified:
subversion/trunk/subversion/libsvn_wc/copy.c
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=1099914&r1=1099913&r2=1099914&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Thu May 5 18:42:46 2011
@@ -422,9 +422,17 @@ copy_versioned_dir(svn_wc__db_t *db,
db, child_src_abspath,
iterpool, iterpool));
- if (child_status == svn_wc__db_status_normal
- || child_status == svn_wc__db_status_added
- || child_status == svn_wc__db_status_incomplete)
+ if (child_status == svn_wc__db_status_deleted
+ || child_status == svn_wc__db_status_not_present
+ || child_status == svn_wc__db_status_excluded)
+ {
+ SVN_ERR(copy_deleted_node(db,
+ child_src_abspath, child_dst_abspath,
+ dst_op_root_abspath,
+ cancel_func, cancel_baton, NULL, NULL,
+ iterpool));
+ }
+ else
{
if (child_kind == svn_wc__db_kind_file)
SVN_ERR(copy_versioned_file(db,
@@ -446,21 +454,6 @@ copy_versioned_dir(svn_wc__db_t *db,
svn_dirent_local_style(child_src_abspath,
scratch_pool));
}
- else if (child_status == svn_wc__db_status_deleted
- || child_status == svn_wc__db_status_not_present
- || child_status == svn_wc__db_status_excluded)
- {
- SVN_ERR(copy_deleted_node(db,
- child_src_abspath, child_dst_abspath,
- dst_op_root_abspath,
- cancel_func, cancel_baton, NULL, NULL,
- iterpool));
- }
- else
- {
- /* Absent nodes should have been handled before we reach this */
- SVN_ERR_MALFUNCTION();
- }
if (disk_children
&& (child_status == svn_wc__db_status_normal
