Author: philip
Date: Wed Jul 28 09:55:10 2010
New Revision: 980011
URL: http://svn.apache.org/viewvc?rev=980011&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(svn_wc_add4): Always use the same function to check for locks.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=980011&r1=980010&r2=980011&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Jul 28 09:55:10 2010
@@ -1194,10 +1194,10 @@ svn_wc_add4(svn_wc_context_t *wc_ctx,
### Perhaps the lock should be created in the same
transaction that adds the node? */
- svn_boolean_t locked;
- SVN_ERR(svn_wc_locked2(&locked, NULL, wc_ctx, local_abspath,
- scratch_pool));
- if (!locked)
+ svn_boolean_t owns_lock;
+ SVN_ERR(svn_wc__db_wclock_owns_lock(&owns_lock, db, local_abspath,
+ FALSE, scratch_pool));
+ if (!owns_lock)
SVN_ERR(svn_wc__db_wclock_obtain(db, local_abspath, 0, FALSE,
scratch_pool));
}
