svn commit: r1404708 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[st...@apache.org]

Author: stefan2
Date: Thu Nov  1 18:17:02 2012
New Revision: 1404708

URL: http://svn.apache.org/viewvc?rev=1404708&view=rev
Log:
Follow-up to r1404675: Fix issues with dump / load. 

* subversion/libsvn_fs_fs/fs_fs.c
  (recover_find_max_ids): undo special treatment of expanded size
  (hotcopy_body): don't update 'current' while still copying

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

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1404708&r1=1404707&r2=1404708&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Nov  1 18:17:02 2012
@@ -8797,9 +8797,7 @@ recover_find_max_ids(svn_fs_t *fs, svn_r
      stored in the representation. */
   baton.file = rev_file;
   baton.pool = pool;
-  baton.remaining = data_rep->expanded_size
-                  ? data_rep->expanded_size
-                  : data_rep->size;
+  baton.remaining = data_rep->expanded_size;
   stream = svn_stream_create(&baton, pool);
   svn_stream_set_read(stream, read_handler_recover);
 
@@ -10988,7 +10986,7 @@ hotcopy_body(void *baton, apr_pool_t *po
                                       iterpool));
 
       /* After completing a full shard, update 'current'. */
-      if (!max_files_per_dir || rev % max_files_per_dir == 0)
+      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);