Author: stsp
Date: Tue Jul 9 17:06:12 2013
New Revision: 1501379
URL: http://svn.apache.org/r1501379
Log:
On the 1.8.x-issue4390 branch, merge r1501360 from trunk (clean merge).
Modified:
subversion/branches/1.8.x-issue4390/ (props changed)
subversion/branches/1.8.x-issue4390/subversion/libsvn_wc/wc_db.c
Propchange: subversion/branches/1.8.x-issue4390/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1501360
Modified: subversion/branches/1.8.x-issue4390/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-issue4390/subversion/libsvn_wc/wc_db.c?rev=1501379&r1=1501378&r2=1501379&view=diff
==============================================================================
--- subversion/branches/1.8.x-issue4390/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/1.8.x-issue4390/subversion/libsvn_wc/wc_db.c Tue Jul 9
17:06:12 2013
@@ -13503,6 +13503,7 @@ wclock_obtain_cb(svn_wc__db_wcroot_t *wc
const char *local_relpath,
int levels_to_lock,
svn_boolean_t steal_lock,
+ svn_boolean_t enforce_empty_wq,
apr_pool_t *scratch_pool)
{
svn_sqlite__stmt_t *stmt;
@@ -13532,6 +13533,9 @@ wclock_obtain_cb(svn_wc__db_wcroot_t *wc
scratch_pool));
}
+ if (enforce_empty_wq)
+ svn_wc__db_verify_no_work(wcroot->sdb);
+
/* Check if there are nodes locked below the new lock root */
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb, STMT_FIND_WC_LOCK));
SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
@@ -13679,9 +13683,6 @@ svn_wc__db_wclock_obtain(svn_wc__db_t *d
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- if (db->enforce_empty_wq)
- SVN_ERR(svn_wc__db_verify_no_work(wcroot->sdb));
-
if (!steal_lock)
{
int i;
@@ -13709,7 +13710,7 @@ svn_wc__db_wclock_obtain(svn_wc__db_t *d
SVN_WC__DB_WITH_TXN(
wclock_obtain_cb(wcroot, local_relpath, levels_to_lock, steal_lock,
- scratch_pool),
+ db->enforce_empty_wq, scratch_pool),
wcroot);
return SVN_NO_ERROR;
}
