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 2011/12/15 12:26:10 UTC
svn commit: r1214706 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: stsp
Date: Thu Dec 15 11:26:09 2011
New Revision: 1214706
URL: http://svn.apache.org/viewvc?rev=1214706&view=rev
Log:
* subversion/libsvn_fs_fs/fs_fs.c
(hotcopy_copy_shard_file): Remove the hack for revision zero which was needed
in an earlier revision of this code which used svn_fs_fs__create()
instead of hotcopy_create_empty_dest().
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=1214706&r1=1214705&r2=1214706&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Dec 15 11:26:09 2011
@@ -7839,21 +7839,9 @@ hotcopy_copy_shard_file(const char *src_
}
}
- if (rev == 0)
- {
- /* Revision zero is special. It might already exist in the destination
- * even if the destination is otherwise empty, because it is created
- * during hotcopy initialisation. In this case it will differ from
- * revision zero in the source (because of creation time).
- * So always copy it. */
- SVN_ERR(svn_io_dir_file_copy(src_subdir_shard, dst_subdir_shard,
+ SVN_ERR(hotcopy_io_dir_file_copy(src_subdir_shard, dst_subdir_shard,
apr_psprintf(scratch_pool, "%ld", rev),
scratch_pool));
- }
- else
- SVN_ERR(hotcopy_io_dir_file_copy(src_subdir_shard, dst_subdir_shard,
- apr_psprintf(scratch_pool, "%ld", rev),
- scratch_pool));
return SVN_NO_ERROR;
}