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

[ph...@apache.org]

Author: philip
Date: Mon Jun  7 16:39:38 2010
New Revision: 952327

URL: http://svn.apache.org/viewvc?rev=952327&view=rev
Log:
Followup to r952277.  For SVN_EXPERIMENTAL_COPY, don't try to read the
parent stub kind but pass it instead.  With in-db-props enabled the
full regression testsuite now results in 6 FAIL (not counting upgrade
tests) and 3 XPASS.

* subversion/libsvn_wc/wc_db.c
  (temp_cross_db_copy): Add kind parameter.
  (svn_wc__db_op_copy): Pass kind.

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=952327&r1=952326&r2=952327&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jun  7 16:39:38 2010
@@ -2269,6 +2269,7 @@ temp_cross_db_copy(svn_wc__db_t *db,
                    svn_wc__db_pdh_t *dst_pdh,
                    const char *dst_relpath,
                    svn_wc__db_status_t dst_status,
+                   svn_wc__db_kind_t kind,
                    const apr_array_header_t *children,
                    apr_int64_t copyfrom_id,
                    const char *copyfrom_relpath,
@@ -2276,7 +2277,6 @@ temp_cross_db_copy(svn_wc__db_t *db,
                    apr_pool_t *scratch_pool)
 {
   insert_working_baton_t iwb;
-  svn_wc__db_kind_t kind;
   svn_revnum_t changed_rev;
   apr_time_t changed_date;
   const char *changed_author;
@@ -2286,8 +2286,12 @@ temp_cross_db_copy(svn_wc__db_t *db,
   svn_boolean_t have_row;
   svn_depth_t depth;
 
+  SVN_ERR_ASSERT(kind == svn_wc__db_kind_file
+                 || kind == svn_wc__db_kind_dir
+                 || kind == svn_wc__db_kind_subdir);
+
   SVN_ERR(svn_wc__db_read_info(NULL /* status */,
-                               &kind,
+                               NULL /* kind */,
                                NULL /* revision */,
                                NULL /* repos_relpath */,
                                NULL /* repos_root_url */,
@@ -2310,10 +2314,6 @@ temp_cross_db_copy(svn_wc__db_t *db,
                                NULL /* lock */,
                                db, src_abspath, scratch_pool, scratch_pool));
 
-  SVN_ERR_ASSERT(kind == svn_wc__db_kind_file
-                 || kind == svn_wc__db_kind_dir
-                 || kind == svn_wc__db_kind_subdir);
-
   SVN_ERR(svn_wc__get_pristine_props(&props, db, src_abspath,
                                      scratch_pool, scratch_pool));
 
@@ -2575,7 +2575,8 @@ svn_wc__db_op_copy(svn_wc__db_t *db,
   else
     {
       SVN_ERR(temp_cross_db_copy(db, src_abspath, src_pdh, src_relpath,
-                                 dst_pdh, dst_relpath, dst_status, children,
+                                 dst_pdh, dst_relpath, dst_status,
+                                 kind, children,
                                  copyfrom_id, copyfrom_relpath, copyfrom_rev,
                                  scratch_pool));
     }