Author: stefan2
Date: Sun Aug 24 23:18:46 2014
New Revision: 1620235
URL: http://svn.apache.org/r1620235
Log:
On the revprop-caching-ng branch: Follow-up to r1620224. Missing changes.
* subversion/include/svn_error_codes.h
(SVN_ERR_FS_INVALID_GENERATION): Declare new error code.
* subversion/tests/cmdline/svnadmin_tests.py
(check_hotcopy_fsfs_fsx): Ignore the checksum when checking for revprop
generation 0.
Modified:
subversion/branches/revprop-caching-ng/subversion/include/svn_error_codes.h
subversion/branches/revprop-caching-ng/subversion/tests/cmdline/svnadmin_tests.py
Modified:
subversion/branches/revprop-caching-ng/subversion/include/svn_error_codes.h
URL:
http://svn.apache.org/viewvc/subversion/branches/revprop-caching-ng/subversion/include/svn_error_codes.h?rev=1620235&r1=1620234&r2=1620235&view=diff
==============================================================================
--- subversion/branches/revprop-caching-ng/subversion/include/svn_error_codes.h
(original)
+++ subversion/branches/revprop-caching-ng/subversion/include/svn_error_codes.h
Sun Aug 24 23:18:46 2014
@@ -856,6 +856,11 @@ SVN_ERROR_START
SVN_ERR_FS_CATEGORY_START + 61,
"Container capacity exceeded.")
+ /** @since New in 1.9. */
+ SVN_ERRDEF(SVN_ERR_FS_INVALID_GENERATION,
+ SVN_ERR_FS_CATEGORY_START + 62,
+ "Invalid generation number data.")
+
/* repos errors */
SVN_ERRDEF(SVN_ERR_REPOS_LOCKED,
Modified:
subversion/branches/revprop-caching-ng/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/revprop-caching-ng/subversion/tests/cmdline/svnadmin_tests.py?rev=1620235&r1=1620234&r2=1620235&view=diff
==============================================================================
---
subversion/branches/revprop-caching-ng/subversion/tests/cmdline/svnadmin_tests.py
(original)
+++
subversion/branches/revprop-caching-ng/subversion/tests/cmdline/svnadmin_tests.py
Sun Aug 24 23:18:46 2014
@@ -86,12 +86,6 @@ def check_hotcopy_fsfs_fsx(src, dst):
"source" % src_dirent)
# Compare all files in this directory
for src_file in src_files:
- # Exclude temporary files
- if src_file == 'rev-prop-atomics.shm':
- continue
- if src_file == 'rev-prop-atomics.mutex':
- continue
-
# Ignore auto-created empty lock files as they may or may not
# be present and are neither required by nor do they harm to
# the destination repository.
@@ -143,7 +137,7 @@ def check_hotcopy_fsfs_fsx(src, dst):
# the hotcopy destination (i.e. a fresh cache generation)
if src_file == 'revprop-generation':
f2 = open(dst_path, 'r')
- revprop_gen = int(f2.read().strip())
+ revprop_gen = int(f2.read().strip().split()[1])
if revprop_gen != 0:
raise svntest.Failure("Hotcopy destination has non-zero " +
"revprop generation")
