svn commit: r1501545 - in /subversion/branches/1.8.x-issue4390: ./ subversion/libsvn_wc/wc_db.c

[stsp]

Author: stsp
Date: Tue Jul  9 20:56:15 2013
New Revision: 1501545

URL: http://svn.apache.org/r1501545
Log:
On the 1.8.x-issue4390 branch, merge r1501533 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:r1501533

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=1501545&r1=1501544&r2=1501545&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 
20:56:15 2013
@@ -13534,7 +13534,7 @@ wclock_obtain_cb(svn_wc__db_wcroot_t *wc
     }
 
   if (enforce_empty_wq)
-    svn_wc__db_verify_no_work(wcroot->sdb);
+    SVN_ERR(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));