Stefan Fuhrmann <eq...@web.de> writes:
>> Hey Philip,
>>
>> Thanks for testing and providing the reproduction recipes!
>> With r1331763, all these issues should be fixed. Only the
>> hotcopy tests still need to be fixed / looked into.
>>
> Forget that comment about hotcopy - that is a issue
> Daniel is looking into. With my latest svnadmin commit
> all tests should now pass.
There is still a question about hotcopy. How many, if any, of these new
files need to be copied? I suppose they get created if needed so
hotcopy doesn't need to copy any of them. If so then svnadmin_tests.py
needs to be updated as it explicitly verifies that all files are copied:
./svnadmin_tests.py 8
2012-04-30 12:40:45 [WARNING] CWD:
/home/pm/sw/subversion/obj/subversion/tests/cmdline
2012-04-30 12:40:45 [WARNING] EXCEPTION: Failure:
svn-test-work/repositories/svnadmin_tests-8.backup/db/revprop-geneneration does
not exist in hotcopy destination
Traceback (most recent call last):
File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/main.py",
line 1350, in run
rc = self.pred.run(sandbox)
File
"/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/testcase.py", line
114, in run
return self._delegate.run(sandbox)
File
"/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/testcase.py", line
176, in run
return self.func(sandbox)
File "../../../../src/subversion/tests/cmdline/svnadmin_tests.py", line 447,
in hotcopy_dot
check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
File "../../../../src/subversion/tests/cmdline/svnadmin_tests.py", line 85,
in check_hotcopy_fsfs
"destination" % dst_path)
Failure:
svn-test-work/repositories/svnadmin_tests-8.backup/db/revprop-geneneration does
not exist in hotcopy destination
FAIL: svnadmin_tests.py 8: 'svnadmin hotcopy PATH .'
That's with the following bogus "fix" to hotcopy to avoid the current
hotcopy assert:
Index: subversion/libsvn_fs_fs/fs.c
===================================================================
--- subversion/libsvn_fs_fs/fs.c (revision 1332010)
+++ subversion/libsvn_fs_fs/fs.c (working copy)
@@ -294,6 +294,7 @@
void *cancel_baton,
apr_pool_t *pool)
{
+ const char *uuid;
{
svn_fs_t *fs = src_fs;
const char *path = src_path;
@@ -303,6 +304,7 @@
SVN_ERR(svn_fs_fs__open(fs, path, pool));
SVN_ERR(svn_fs_fs__initialize_caches(fs, pool));
SVN_ERR(fs_serialized_init(fs, pool, pool));
+ uuid = fs->uuid;
}
{
@@ -317,6 +319,8 @@
*/
SVN_ERR(svn_fs_fs__open(fs, path, pool));
SVN_ERR(svn_fs_fs__initialize_caches(fs, pool));
+#else
+ fs->uuid = uuid;
#endif
SVN_ERR(fs_serialized_init(fs, pool, pool));
}
--
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com
