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

[ph...@apache.org]

Author: philip
Date: Mon Jun  7 14:21:35 2010
New Revision: 952240

URL: http://svn.apache.org/viewvc?rev=952240&view=rev
Log:
* subversion/libsvn_wc/copy.c
  (copy_versioned_dir): Try svn_wc__db_temp_forget_directory to see
   if makes it work on Windows.

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=952240&r1=952239&r2=952240&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Mon Jun  7 14:21:35 2010
@@ -1003,6 +1003,13 @@ copy_versioned_dir(svn_wc_context_t *wc_
           /* That creates a base node which we do not want so delete it. */
           SVN_ERR(svn_wc__db_base_remove(wc_ctx->db, tmp_dst_abspath,
                                          scratch_pool));
+
+          /* ### Need to close the database so that Windows can move
+             ### the directory.  Is this the right way to do it?  This
+             ### is not temporary code so the _temp_ name isn't
+             ### right. */
+          SVN_ERR(svn_wc__db_temp_forget_directory(wc_ctx->db, tmp_dst_abspath,
+                                                   scratch_pool));
         }
     }