Author: philip
Date: Wed Jun 30 10:22:26 2010
New Revision: 959258
URL: http://svn.apache.org/viewvc?rev=959258&view=rev
Log:
* subversion/libsvn_wc/upgrade.c
(wipe_obsolete_files): Remove text-base directory if wc format is high
enough.
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=959258&r1=959257&r2=959258&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Wed Jun 30 10:22:26 2010
@@ -467,25 +467,25 @@ wipe_obsolete_files(const char *wcroot_a
scratch_pool),
TRUE, scratch_pool));
-#if 0 /* ### NOT READY TO WIPE THESE FILES!! */
- /* Remove the old properties files... whole directories at a time. */
+#if (SVN_WC__VERSION >= 17)
+ /* Remove the old text-base directory and the old text-base files. */
svn_error_clear(svn_io_remove_dir2(
svn_wc__adm_child(wcroot_abspath,
- PROPS_SUBDIR,
+ TEXT_BASE_SUBDIR,
scratch_pool),
FALSE, NULL, NULL, scratch_pool));
+#endif
+
+#if 0 /* ### NOT READY TO WIPE THESE FILES!! */
+ /* Remove the old properties files... whole directories at a time. */
svn_error_clear(svn_io_remove_dir2(
svn_wc__adm_child(wcroot_abspath,
- PROP_BASE_SUBDIR,
+ PROPS_SUBDIR,
scratch_pool),
FALSE, NULL, NULL, scratch_pool));
-#endif
-
-#if 0 /* Conditional upon upgrading to format 18 */
- /* Remove the old text-base directory. */
svn_error_clear(svn_io_remove_dir2(
svn_wc__adm_child(wcroot_abspath,
- TEXT_BASE_SUBDIR,
+ PROP_BASE_SUBDIR,
scratch_pool),
FALSE, NULL, NULL, scratch_pool));
#endif
