Author: philip
Date: Thu Sep 9 09:42:32 2010
New Revision: 995363
URL: http://svn.apache.org/viewvc?rev=995363&view=rev
Log:
Make upgrade rerunnable after an interrupt without needing to use
pre-1.7 for cleanup.
* subversion/libsvn_wc/upgrade.c
(upgrade_to_wcng): Delete any previous partial upgrade.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=995363&r1=995362&r2=995363&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu Sep 9 09:42:32 2010
@@ -1308,6 +1308,8 @@ upgrade_to_wcng(svn_wc__db_t *db,
"wcng", result_pool);
root_adm_abspath = svn_wc__adm_child(data->root_abspath, "",
scratch_pool);
+ SVN_ERR(svn_io_remove_dir2(root_adm_abspath, TRUE, NULL, NULL,
+ scratch_pool));
SVN_ERR(svn_wc__ensure_directory(root_adm_abspath, scratch_pool));
/* Create an empty sqlite database for this directory. */
