Author: stsp
Date: Tue Jul 12 22:30:25 2011
New Revision: 1145798
URL: http://svn.apache.org/viewvc?rev=1145798&view=rev
Log:
Follow-up to r1145792:
* subversion/libsvn_wc/copy.c
(copy_versioned_dir): Pass the right set of parameters to
svn_wc__db_op_copy() such that behaviour matches pre-r1145792 behaviour.
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=1145798&r1=1145797&r2=1145798&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Tue Jul 12 22:30:25 2011
@@ -479,9 +479,9 @@ copy_versioned_dir(svn_wc__db_t *db,
{
/* This will be copied as some kind of deletion. Don't touch
any actual files */
- SVN_ERR(svn_wc__db_op_copy(db, src_abspath, dst_abspath,
+ SVN_ERR(svn_wc__db_op_copy(db, child_src_abspath, child_dst_abspath,
dst_op_root_abspath,
- NULL, scratch_pool));
+ NULL, iterpool));
/* Don't recurse on children while all we do is creating not-present
children */
