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/10/25 11:51:49 UTC
svn commit: r1535670 -
/subversion/branches/log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
Author: stefan2
Date: Fri Oct 25 09:51:49 2013
New Revision: 1535670
URL: http://svn.apache.org/r1535670
Log:
On the log-addressing branch:
* subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
(write_format): actually handle the various format file versions
Modified:
subversion/branches/log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
Modified: subversion/branches/log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c?rev=1535670&r1=1535669&r2=1535670&view=diff
==============================================================================
--- subversion/branches/log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c (original)
+++ subversion/branches/log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c Fri Oct 25 09:51:49 2013
@@ -55,18 +55,35 @@ write_format(const char *path,
if (format >= SVN_FS_FS__MIN_LAYOUT_FORMAT_OPTION_FORMAT)
{
- if (max_files_per_dir)
- contents = apr_psprintf(pool,
- "%d\n"
- "layout sharded %d\n"
- "addressing logical 0\n",
- format, max_files_per_dir);
+ if (format >= SVN_FS_FS__MIN_LOG_ADDRESSING_FORMAT)
+ {
+ if (max_files_per_dir)
+ contents = apr_psprintf(pool,
+ "%d\n"
+ "layout sharded %d\n"
+ "addressing logical 0\n",
+ format, max_files_per_dir);
+ else
+ /* linear layouts never use logical addressing */
+ contents = apr_psprintf(pool,
+ "%d\n"
+ "layout linear\n"
+ "addressing physical\n",
+ format);
+ }
else
- contents = apr_psprintf(pool,
- "%d\n"
- "layout linear\n"
- "addressing physical\n",
- format);
+ {
+ if (max_files_per_dir)
+ contents = apr_psprintf(pool,
+ "%d\n"
+ "layout sharded %d\n",
+ format, max_files_per_dir);
+ else
+ contents = apr_psprintf(pool,
+ "%d\n"
+ "layout linear\n",
+ format);
+ }
}
else
{