subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r979770 - in /subversion/trunk/subversion/libsvn_wc: copy.c wc_db.c
Date Tue, 27 Jul 2010 16:47:41 GMT
Author: philip
Date: Tue Jul 27 16:47:40 2010
New Revision: 979770

URL: http://svn.apache.org/viewvc?rev=979770&view=rev
Log:
Make copy_tests.py 69 XPASS in single-db.

* subversion/libsvn_wc/copy.c
  (copy_versioned_dir): Don't do parent stub copy in single-db.

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_op_copy): Don't do parent stub adjustment in single-db.

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

Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=979770&r1=979769&r2=979770&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Tue Jul 27 16:47:40 2010
@@ -368,14 +368,16 @@ copy_versioned_dir(svn_wc__db_t *db,
   SVN_ERR(svn_wc__wq_run(db, dir_abspath,
                          cancel_func, cancel_baton, scratch_pool));
 
+#ifndef SVN_WC__SINGLE_DB
   if (kind == svn_node_dir)
     {
       /* The first copy only does the parent stub, this second copy
          does the full node but can only happen after the workqueue
-         has move the destination into place. */
+         has moved the destination into place. */
       SVN_ERR(svn_wc__db_op_copy(db, src_abspath, dst_abspath,
                                  NULL, scratch_pool));
     }
+#endif
 
   if (notify_func)
     {

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=979770&r1=979769&r2=979770&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Jul 27 16:47:40 2010
@@ -3232,6 +3232,7 @@ svn_wc__db_op_copy(svn_wc__db_t *db,
     }
 
 
+#ifndef SVN_WC__SINGLE_DB
   /* 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)
@@ -3248,6 +3249,7 @@ svn_wc__db_op_copy(svn_wc__db_t *db,
       src_relpath = svn_dirent_basename(src_abspath, NULL);
       kind = svn_wc__db_kind_subdir;
     }
+#endif
 
   /* Get the children for a directory if this is not the parent stub */
   if (kind == svn_wc__db_kind_dir)



Mime
View raw message