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 2012/03/28 06:00:07 UTC
svn commit: r1306142 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_client/externals.c
Author: svn-role
Date: Wed Mar 28 04:00:07 2012
New Revision: 1306142
URL: http://svn.apache.org/viewvc?rev=1306142&view=rev
Log:
Merge r1300265 from trunk:
* r1300265
Resolve issue #4130, "poor memory and file handle management when
updating w/ externals definitions".
Justification:
Simple fix with noticeable scalability returns.
Votes:
+1: cmpilato, stsp
+1: rhuijben (I would like a better fix, but I don't think we can do that
for 1.7.x)
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/externals.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1300265
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1306142&r1=1306141&r2=1306142&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Mar 28 04:00:07 2012
@@ -119,16 +119,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1300265
- Resolve issue #4130, "poor memory and file handle management when
- updating w/ externals definitions".
- Justification:
- Simple fix with noticeable scalability returns.
- Votes:
- +1: cmpilato, stsp
- +1: rhuijben (I would like a better fix, but I don't think we can do that
- for 1.7.x)
-
* r1302417
Fix another ra_serf assert (MERGE fails).
Notes:
Modified: subversion/branches/1.7.x/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/externals.c?rev=1306142&r1=1306141&r2=1306142&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/externals.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/externals.c Wed Mar 28 04:00:07 2012
@@ -175,6 +175,8 @@ switch_dir_external(const char *local_ab
timestamp_sleep,
ctx, subpool));
svn_pool_destroy(subpool);
+ /* Issue #4130: We don't need to keep the external's DB open. */
+ SVN_ERR(svn_wc__close_db(local_abspath, ctx->wc_ctx, pool));
return SVN_NO_ERROR;
}
@@ -235,6 +237,8 @@ switch_dir_external(const char *local_ab
subpool));
svn_pool_destroy(subpool);
+ /* Issue #4130: We don't need to keep the external's DB open. */
+ SVN_ERR(svn_wc__close_db(local_abspath, ctx->wc_ctx, pool));
return SVN_NO_ERROR;
}
}