You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/11/09 18:24:01 UTC
svn commit: r1033108 -
/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Author: julianfoad
Date: Tue Nov 9 17:24:01 2010
New Revision: 1033108
URL: http://svn.apache.org/viewvc?rev=1033108&view=rev
Log:
Fix op-depth-test 2.
* subversion/tests/libsvn_wc/op-depth-test.c
(wc_revert): Lock the path before trying to revert it.
Modified:
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1033108&r1=1033107&r2=1033108&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Tue Nov 9 17:24:01 2010
@@ -170,11 +170,16 @@ static svn_error_t *
wc_revert(wc_baton_t *b, const char *path, svn_depth_t depth)
{
const char *abspath = wc_path(b, path);
+ const char *lock_root_abspath;
- return svn_wc_revert4(b->wc_ctx, abspath, depth, FALSE, NULL,
- NULL, NULL, /* cancel baton + func */
- NULL, NULL, /* notify baton + func */
- b->pool);
+ SVN_ERR(svn_wc__acquire_write_lock(&lock_root_abspath, b->wc_ctx, abspath,
+ TRUE /* lock_anchor */, b->pool, b->pool));
+ SVN_ERR(svn_wc_revert4(b->wc_ctx, abspath, depth, FALSE, NULL,
+ NULL, NULL, /* cancel baton + func */
+ NULL, NULL, /* notify baton + func */
+ b->pool));
+ SVN_ERR(svn_wc__release_write_lock(b->wc_ctx, lock_root_abspath, b->pool));
+ return SVN_NO_ERROR;
}
static svn_error_t *