You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/11/04 19:22:25 UTC
svn commit: r1031125 - /subversion/trunk/subversion/libsvn_client/copy.c
Author: julianfoad
Date: Thu Nov 4 18:22:25 2010
New Revision: 1031125
URL: http://svn.apache.org/viewvc?rev=1031125&view=rev
Log:
Un-break the Windows build. A follow-up to r1031078.
* subversion/libsvn_client/copy.c
(repos_to_wc_copy_single): Use svn_wc_remove_from_revision_control2()
to properly remove the admin area. Simple deletion is wrong (and
doesn't work on Windows because the DB is still open.
Modified:
subversion/trunk/subversion/libsvn_client/copy.c
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1031125&r1=1031124&r2=1031125&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Thu Nov 4 18:22:25 2010
@@ -45,7 +45,6 @@
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
#include "private/svn_mergeinfo_private.h"
-#include "../libsvn_wc/adm_files.h"
/*
@@ -1508,9 +1507,14 @@ repos_to_wc_copy_single(svn_client__copy
TRUE /* metadata_only */,
ctx->cancel_func, ctx->cancel_baton,
NULL, NULL, pool));
- SVN_ERR(svn_io_remove_dir2(svn_wc__adm_child(tmp_abspath, NULL, pool),
- FALSE /* ignore_enoent */,
- ctx->cancel_func, ctx->cancel_baton, pool));
+ SVN_ERR(svn_wc__acquire_write_lock(NULL, ctx->wc_ctx, tmp_abspath,
+ FALSE, pool, pool));
+ SVN_ERR(svn_wc_remove_from_revision_control2(ctx->wc_ctx,
+ tmp_abspath,
+ FALSE, FALSE,
+ ctx->cancel_func,
+ ctx->cancel_baton,
+ pool));
}
else
{