subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r951324 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Fri, 04 Jun 2010 08:47:58 GMT
Author: philip
Date: Fri Jun  4 08:47:58 2010
New Revision: 951324

URL: http://svn.apache.org/viewvc?rev=951324&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (temp_cross_db_copy): Use blank_iwb.
  (svn_wc__db_op_copy): Clarify a comment.

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=951324&r1=951323&r2=951324&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jun  4 08:47:58 2010
@@ -2246,6 +2246,7 @@ temp_cross_db_copy(svn_wc__db_t *db,
   SVN_ERR(svn_wc__get_pristine_props(&props, db, src_abspath,
                                      scratch_pool, scratch_pool));
 
+  blank_iwb(&iwb);
   iwb.presence = svn_wc__db_status_normal;
   iwb.kind = kind;
   iwb.wc_id = dst_pdh->wcroot->wc_id;
@@ -2264,8 +2265,6 @@ temp_cross_db_copy(svn_wc__db_t *db,
   iwb.children = children;
   iwb.depth = depth;
 
-  iwb.work_items = NULL;
-
   SVN_ERR(insert_working_node(&iwb, dst_pdh->wcroot->sdb, scratch_pool));
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, src_pdh->wcroot->sdb,
@@ -2410,8 +2409,8 @@ svn_wc__db_op_copy(svn_wc__db_t *db,
         }
     }
 
-  /* When copying a directory we only copy the parent stub if the
-     destination directory does not exist.  */
+  /* When copying a directory the destination may not exist, if so we
+     only copy the parent stub */
   if (kind == svn_wc__db_kind_dir && !*src_relpath && *dst_relpath)
     {
       SVN_ERR(navigate_to_parent(&src_pdh, db, src_pdh,



Mime
View raw message