Author: pburba Date: Fri Jun 4 14:25:09 2010 New Revision: 951417 URL: http://svn.apache.org/viewvc?rev=951417&view=rev Log: Follow-up to 920424, don't conflate switched and disjoint WC paths.
* subversion/libsvn_wc/lock.c (svn_wc__path_switched): Use svn_wc__check_wc_root() rather than child_is_disjoint() to detect switched paths. The former will report any disjoint path as switched, but switched paths are merely one of several disjoint flavors, see http://svn.haxx.se/dev/archive-2010-06/0014.shtml. Modified: subversion/trunk/subversion/libsvn_wc/lock.c Modified: subversion/trunk/subversion/libsvn_wc/lock.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=951417&r1=951416&r2=951417&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/lock.c (original) +++ subversion/trunk/subversion/libsvn_wc/lock.c Fri Jun 4 14:25:09 2010 @@ -1732,8 +1732,10 @@ svn_wc__path_switched(svn_boolean_t *swi const char *local_abspath, apr_pool_t *scratch_pool) { - return svn_error_return(child_is_disjoint(switched, wc_ctx->db, - local_abspath, scratch_pool)); + svn_boolean_t wc_root; + + return svn_wc__check_wc_root(&wc_root, NULL, switched, wc_ctx->db, + local_abspath, scratch_pool); }
