You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/01/28 09:54:09 UTC
svn commit: r1439305 - in /subversion/trunk/subversion:
libsvn_fs/fs-loader.c tests/cmdline/svnadmin_tests.py
Author: philip
Date: Mon Jan 28 08:54:08 2013
New Revision: 1439305
URL: http://svn.apache.org/viewvc?rev=1439305&view=rev
Log:
Fix some bits missed in the verfiy change r1439210.
* subversion/libsvn_fs/fs-loader.c
(svn_fs_verify): Redorder parameters in vtable call.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_windows_paths_in_repos): Adjust expected text.
Modified:
subversion/trunk/subversion/libsvn_fs/fs-loader.c
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1439305&r1=1439304&r2=1439305&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Mon Jan 28 08:54:08 2013
@@ -498,9 +498,10 @@ svn_fs_verify(const char *path,
fs = fs_new(NULL, pool);
SVN_MUTEX__WITH_LOCK(common_pool_lock,
- vtable->verify_fs(fs, path, cancel_func, cancel_baton,
- notify_func, notify_baton, start,
- end, pool, common_pool));
+ vtable->verify_fs(fs, path, start, end,
+ notify_func, notify_baton,
+ cancel_func, cancel_baton,
+ pool, common_pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1439305&r1=1439304&r2=1439305&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Mon Jan 28 08:54:08 2013
@@ -554,7 +554,7 @@ def verify_windows_paths_in_repos(sbox):
if svntest.main.is_fs_type_fsfs():
svntest.verify.compare_and_display_lines(
"Error while running 'svnadmin verify'.",
- 'STDERR', ["* Verifying global structure ...\n",
+ 'STDERR', ["* Verifying repository metadata ...\n",
"* Verified revision 0.\n",
"* Verified revision 1.\n",
"* Verified revision 2.\n"], errput)