You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/11/01 18:07:00 UTC
svn commit: r1404675 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: stefan2
Date: Thu Nov 1 17:06:59 2012
New Revision: 1404675
URL: http://svn.apache.org/viewvc?rev=1404675&view=rev
Log:
Fix hotcopy for format 2 FSFS repositories.
* subversion/libsvn_fs_fs/fs_fs.c
(recover_find_max_ids): if expanded size is 0, its == size
(hotcopy_body): fix division by zero
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=1404675&r1=1404674&r2=1404675&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Nov 1 17:06:59 2012
@@ -8797,7 +8797,9 @@ 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;
+ baton.remaining = data_rep->expanded_size
+ ? data_rep->expanded_size
+ : data_rep->size;
stream = svn_stream_create(&baton, pool);
svn_stream_set_read(stream, read_handler_recover);
@@ -10986,7 +10988,7 @@ hotcopy_body(void *baton, apr_pool_t *po
iterpool));
/* After completing a full shard, update 'current'. */
- if (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);
Re: svn commit: r1404675 -
/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
stefan2@apache.org wrote on Thu, Nov 01, 2012 at 17:07:00 -0000:
> Author: stefan2
> Date: Thu Nov 1 17:06:59 2012
> New Revision: 1404675
>
> URL: http://svn.apache.org/viewvc?rev=1404675&view=rev
> Log:
> Fix hotcopy for format 2 FSFS repositories.
>
Thanks
Daniel
Re: svn commit: r1404675 -
/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
stefan2@apache.org wrote on Thu, Nov 01, 2012 at 17:07:00 -0000:
> Author: stefan2
> Date: Thu Nov 1 17:06:59 2012
> New Revision: 1404675
>
> URL: http://svn.apache.org/viewvc?rev=1404675&view=rev
> Log:
> Fix hotcopy for format 2 FSFS repositories.
>
Thanks
Daniel