svn commit: r1346329 - /subversion/trunk/subversion/libsvn_wc/copy.c

[rhuijben]

Author: rhuijben
Date: Tue Jun  5 10:16:25 2012
New Revision: 1346329

URL: http://svn.apache.org/viewvc?rev=1346329&view=rev
Log:
* libsvn_wc/copy.c
  (copy_versioned_dir): Skip checking for conflicts if we already copied
    all nodes.

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=1346329&r1=1346328&r2=1346329&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Tue Jun  5 10:16:25 2012
@@ -457,7 +457,7 @@ copy_versioned_dir(svn_wc__db_t *db,
 
   /* Copy the remaining filesystem children, which are unversioned, skipping
      any conflict-marker files. */
-  if (disk_children)
+  if (disk_children && apr_hash_count(disk_children))
     {
       apr_hash_index_t *hi;
       apr_hash_t *marker_files;