Author: danielsh
Date: Fri Mar 29 05:23:25 2013
New Revision: 1462403
URL: http://svn.apache.org/r1462403
Log:
Cherry-pick r1462402 from branches/verify-at-commit. This removes a 'verify'
call in maintainer builds and simplifies code.
(As a side-effect, this will cause the eventual coalescion of the branch
into trunk to not be a simple "reintegrate-style" merge.)
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/libsvn_fs/fs-loader.c
Propchange: subversion/trunk/
------------------------------------------------------------------------------
Merged /subversion/branches/verify-at-commit:r1462402
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1462403&r1=1462402&r2=1462403&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Fri Mar 29 05:23:25 2013
@@ -750,24 +750,11 @@ svn_fs_commit_txn(const char **conflict_
svn_fs_txn_t *txn, apr_pool_t *pool)
{
svn_error_t *err;
-#if defined(PACK_AFTER_EVERY_COMMIT) || defined(SVN_DEBUG)
- svn_fs_root_t *txn_root;
-#endif
*new_rev = SVN_INVALID_REVNUM;
if (conflict_p)
*conflict_p = NULL;
-#if defined(PACK_AFTER_EVERY_COMMIT) || defined(SVN_DEBUG)
- SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
-#endif
-
-#ifdef SVN_DEBUG
- /* ### TODO: add db/fs.conf with a knob to enable this in release builds */
- /* ### TODO: should this run just before incrementing 'current'? */
- SVN_ERR(svn_fs_verify_root(txn_root, pool));
-#endif
-
err = txn->vtable->commit(conflict_p, new_rev, txn, pool);
#ifdef SVN_DEBUG
@@ -786,7 +773,7 @@ svn_fs_commit_txn(const char **conflict_
#ifdef PACK_AFTER_EVERY_COMMIT
{
- svn_fs_t *fs = svn_fs_root_fs(txn_root);
+ svn_fs_t *fs = txn->fs;
const char *fs_path = svn_fs_path(fs, pool);
err = svn_fs_pack(fs_path, NULL, NULL, NULL, NULL, pool);
if (err && err->apr_err == SVN_ERR_UNSUPPORTED_FEATURE)
