subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1461747 - in /subversion/branches/1.7.x-r1461743: ./ subversion/libsvn_fs/fs-loader.c
Date Wed, 27 Mar 2013 17:58:13 GMT
Author: danielsh
Date: Wed Mar 27 17:58:13 2013
New Revision: 1461747

URL: http://svn.apache.org/r1461747
Log:
On the r1461743 branch, backport r1461743.

Modified:
    subversion/branches/1.7.x-r1461743/   (props changed)
    subversion/branches/1.7.x-r1461743/subversion/libsvn_fs/fs-loader.c

Propchange: subversion/branches/1.7.x-r1461743/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1461743

Modified: subversion/branches/1.7.x-r1461743/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1461743/subversion/libsvn_fs/fs-loader.c?rev=1461747&r1=1461746&r2=1461747&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1461743/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/1.7.x-r1461743/subversion/libsvn_fs/fs-loader.c Wed Mar 27 17:58:13
2013
@@ -671,19 +671,20 @@ svn_fs_commit_txn(const char **conflict_
 {
 #ifdef PACK_AFTER_EVERY_COMMIT
   svn_fs_root_t *txn_root;
-  svn_fs_t *fs;
-  const char *fs_path;
+#endif
 
   *new_rev = SVN_INVALID_REVNUM;
+
+#if defined(PACK_AFTER_EVERY_COMMIT)
   SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
-  fs = svn_fs_root_fs(txn_root);
-  fs_path = svn_fs_path(fs, pool);
 #endif
 
   SVN_ERR(txn->vtable->commit(conflict_p, new_rev, txn, pool));
 
 #ifdef PACK_AFTER_EVERY_COMMIT
   {
+    svn_fs_t *fs = svn_fs_root_fs(txn_root);
+    const char *fs_path = svn_fs_path(fs, pool);
     svn_error_t *err = svn_fs_pack(fs_path, NULL, NULL, NULL, NULL, pool);
     if (err && err->apr_err == SVN_ERR_UNSUPPORTED_FEATURE)
       /* Pre-1.6 filesystem. */



Mime
View raw message