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 2013/11/10 00:01:59 UTC
svn commit: r1540422 - in /subversion/branches/1.8.x-issue4448: ./
subversion/libsvn_fs_fs/fs_fs.c
Author: stefan2
Date: Sat Nov 9 23:01:59 2013
New Revision: 1540422
URL: http://svn.apache.org/r1540422
Log:
Merged r1540044, r1540417 from trunk and resolved tree conflict
caused by refactoring on trunk.
Modified:
subversion/branches/1.8.x-issue4448/ (props changed)
subversion/branches/1.8.x-issue4448/subversion/libsvn_fs_fs/fs_fs.c
Propchange: subversion/branches/1.8.x-issue4448/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1540044,1540417
Modified: subversion/branches/1.8.x-issue4448/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-issue4448/subversion/libsvn_fs_fs/fs_fs.c?rev=1540422&r1=1540421&r2=1540422&view=diff
==============================================================================
--- subversion/branches/1.8.x-issue4448/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.8.x-issue4448/subversion/libsvn_fs_fs/fs_fs.c Sat Nov 9 23:01:59 2013
@@ -11293,16 +11293,18 @@ hotcopy_body(void *baton, apr_pool_t *po
SVN_ERR(hotcopy_remove_rev_files(dst_fs, rev,
rev + max_files_per_dir,
max_files_per_dir, iterpool));
- SVN_ERR(hotcopy_remove_revprop_files(dst_fs, rev,
- rev + max_files_per_dir,
- max_files_per_dir, iterpool));
+ if (dst_ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
+ SVN_ERR(hotcopy_remove_revprop_files(dst_fs, rev,
+ rev + max_files_per_dir,
+ max_files_per_dir,
+ iterpool));
}
/* Now that all revisions have moved into the pack, the original
* rev dir can be removed. */
SVN_ERR(remove_folder(path_rev_shard(dst_fs, rev, iterpool),
cancel_func, cancel_baton, iterpool));
- if (rev > 0)
+ if (rev > 0 && dst_ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
SVN_ERR(remove_folder(path_revprops_shard(dst_fs, rev, iterpool),
cancel_func, cancel_baton, iterpool));
}