svn commit: r1585516 - /subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c

[st...@apache.org]

Author: stefan2
Date: Mon Apr  7 16:30:55 2014
New Revision: 1585516

URL: http://svn.apache.org/r1585516
Log:
Revert r1560723.  For details, see the thread starting at
http://svn.haxx.se/dev/archive-2014-01/0089.shtml

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c?rev=1585516&r1=1585515&r2=1585516&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c Mon Apr  7 16:30:55 2014
@@ -867,20 +867,8 @@ hotcopy_body(void *baton, apr_pool_t *po
                                       rev, max_files_per_dir, FALSE,
                                       iterpool));
 
-      /* After completing a full shard, update 'current'.  For non-sharded
-       * repositories, update after every revision.
-       * 
-       * This "checkpoints" the progress we made so far and prevents us from
-       * starting all over again if the hotcopy process got canceled.  It is
-       * not _necessary_ to update "current" until the very end (see further
-       * below); it's a performance trade-off between different scenarios.
-       *
-       * Repositories with global IDs must do a full repo scan here to find
-       * the latest IDs.  Because that's too expensive, we don't checkpoint
-       * pre-1.4 repositories.
-       */
-      if (   (!max_files_per_dir || rev % max_files_per_dir == 0)
-          && dst_ffd->format >= SVN_FS_FS__MIN_NO_GLOBAL_IDS_FORMAT)
+      /* After completing a full shard, update 'current'. */
+      if (max_files_per_dir && rev % max_files_per_dir == 0)
         SVN_ERR(hotcopy_update_current(&dst_youngest, dst_fs, rev, iterpool));
     }
   svn_pool_destroy(iterpool);