You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/25 19:02:39 UTC
svn commit: r1581435 - in /subversion/branches/1.8.x-r1580626: ./
subversion/tests/libsvn_wc/utils.c
Author: rhuijben
Date: Tue Mar 25 18:02:38 2014
New Revision: 1581435
URL: http://svn.apache.org/r1581435
Log:
Merge r1581430 from trunk
Modified:
subversion/branches/1.8.x-r1580626/ (props changed)
subversion/branches/1.8.x-r1580626/subversion/tests/libsvn_wc/utils.c
Propchange: subversion/branches/1.8.x-r1580626/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1581430
Modified: subversion/branches/1.8.x-r1580626/subversion/tests/libsvn_wc/utils.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1580626/subversion/tests/libsvn_wc/utils.c?rev=1581435&r1=1581434&r2=1581435&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1580626/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/branches/1.8.x-r1580626/subversion/tests/libsvn_wc/utils.c Tue Mar 25 18:02:38 2014
@@ -331,15 +331,26 @@ sbox_wc_commit_ex(svn_test__sandbox_t *b
svn_depth_t depth)
{
svn_client_ctx_t *ctx;
- SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
+ apr_pool_t *scratch_pool = svn_pool_create(b->pool);
+ svn_error_t *err;
+
+ SVN_ERR(svn_client_create_context2(&ctx, NULL, scratch_pool));
ctx->wc_ctx = b->wc_ctx;
- return svn_client_commit6(targets, depth,
- FALSE /* keep_locks */,
- FALSE /* keep_changelist */,
- TRUE /* commit_as_operations */,
- TRUE /* include_file_externals */,
- FALSE /* include_dir_externals */,
- NULL, NULL, NULL, NULL, ctx, b->pool);
+
+ /* A successfull commit doesn't close the ra session, but leaves that
+ to the caller. This leaves the BDB handle open, which might cause
+ problems in further test code. (op_depth_tests.c's repo_wc_copy) */
+ err = svn_client_commit6(targets, depth,
+ FALSE /* keep_locks */,
+ FALSE /* keep_changelist */,
+ TRUE /* commit_as_operations */,
+ TRUE /* include_file_externals */,
+ FALSE /* include_dir_externals */,
+ NULL, NULL, NULL, NULL, ctx, scratch_pool);
+
+ svn_pool_destroy(scratch_pool);
+
+ return svn_error_trace(err);
}
svn_error_t *