You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/05/14 06:01:38 UTC
svn commit: r1482190 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_fs/fs-loader.c
Author: svn-role
Date: Tue May 14 04:01:38 2013
New Revision: 1482190
URL: http://svn.apache.org/r1482190
Log:
Reintegrate the 1.7.x-r1461743 branch:
* r1461743
Set output parameter in non-maintainer builds, in svn_fs_commit_txn().
Justification:
Part of the API contract.
Branch: 1.7.x-r1461743
Votes:
+1: danielsh, stsp, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_fs/fs-loader.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1461743
Merged /subversion/branches/1.7.x-r1461743:r1461745-1482189
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1482190&r1=1482189&r2=1482190&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue May 14 04:01:38 2013
@@ -283,14 +283,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1461743
- Set output parameter in non-maintainer builds, in svn_fs_commit_txn().
- Justification:
- Part of the API contract.
- Branch: 1.7.x-r1461743
- Votes:
- +1: danielsh, stsp, rhuijben
-
* r1476359
JavaHL thread safety bug.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_fs/fs-loader.c?rev=1482190&r1=1482189&r2=1482190&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_fs/fs-loader.c Tue May 14 04:01:38 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. */