svn commit: r1039085 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[ju...@apache.org]

Author: julianfoad
Date: Thu Nov 25 16:26:16 2010
New Revision: 1039085

URL: http://svn.apache.org/viewvc?rev=1039085&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (db_op_copy): Fix the insertion of incomplete children. A follow-up to
    r1038999.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1039085&r1=1039084&r2=1039085&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Nov 25 16:26:16 2010
@@ -3005,6 +3005,11 @@ get_info_for_copy(apr_int64_t *copyfrom_
 }
 
 static svn_error_t *
+op_depth_of(apr_int64_t *op_depth,
+            svn_wc__db_pdh_t *pdh,
+            const char *local_relpath);
+
+static svn_error_t *
 op_depth_for_copy(apr_int64_t *op_depth,
                   apr_int64_t copyfrom_repos_id,
                   const char *copyfrom_relpath,
@@ -3073,9 +3078,13 @@ db_op_copy(svn_wc__db_pdh_t *src_pdh,
     }
 
   if (kind == svn_wc__db_kind_dir)
-    SVN_ERR(gather_repo_children(&children, src_pdh, src_relpath,
-                                 relpath_depth(src_relpath),
-                                 scratch_pool, scratch_pool));
+    {
+      apr_int64_t src_op_depth;
+
+      SVN_ERR(op_depth_of(&src_op_depth, src_pdh, src_relpath));
+      SVN_ERR(gather_repo_children(&children, src_pdh, src_relpath,
+                                   src_op_depth, scratch_pool, scratch_pool));
+    }
   else
     children = NULL;