Index: subversion/libsvn_wc/upgrade.c
===================================================================
--- subversion/libsvn_wc/upgrade.c	(revision 1603773)
+++ subversion/libsvn_wc/upgrade.c	(working copy)
@@ -430,21 +430,24 @@
 
 /* Wipe out all the obsolete files/dirs from the administrative area.  */
 static void
-wipe_obsolete_files(const char *wcroot_abspath, apr_pool_t *scratch_pool)
+wipe_obsolete_files(const char *wcroot_abspath, svn_boolean_t remove_format_entries, apr_pool_t *scratch_pool)
 {
   /* Zap unused files.  */
+  if (remove_format_entries)
+  {
+    svn_error_clear(svn_io_remove_file2(
+                      svn_wc__adm_child(wcroot_abspath,
+                                        SVN_WC__ADM_FORMAT,
+                                        scratch_pool),
+                      TRUE, scratch_pool));
+    svn_error_clear(svn_io_remove_file2(
+                      svn_wc__adm_child(wcroot_abspath,
+                                        SVN_WC__ADM_ENTRIES,
+                                        scratch_pool),
+                      TRUE, scratch_pool));
+  }
   svn_error_clear(svn_io_remove_file2(
                     svn_wc__adm_child(wcroot_abspath,
-                                      SVN_WC__ADM_FORMAT,
-                                      scratch_pool),
-                    TRUE, scratch_pool));
-  svn_error_clear(svn_io_remove_file2(
-                    svn_wc__adm_child(wcroot_abspath,
-                                      SVN_WC__ADM_ENTRIES,
-                                      scratch_pool),
-                    TRUE, scratch_pool));
-  svn_error_clear(svn_io_remove_file2(
-                    svn_wc__adm_child(wcroot_abspath,
                                       ADM_EMPTY_FILE,
                                       scratch_pool),
                     TRUE, scratch_pool));
@@ -564,7 +567,7 @@
                                                          iterpool),
                                        TRUE, NULL, NULL, iterpool));
   else
-    wipe_obsolete_files(dir_abspath, scratch_pool);
+    wipe_obsolete_files(dir_abspath, TRUE, scratch_pool);
 
   if (delete_dir)
     {
@@ -1977,7 +1980,7 @@
 #endif
 
   /* Zap anything that might be remaining or escaped our notice.  */
-  wipe_obsolete_files(wcroot_abspath, scratch_pool);
+  wipe_obsolete_files(wcroot_abspath, FALSE, scratch_pool);
 
   return SVN_NO_ERROR;
 }