svn commit: r940432 - in /subversion/trunk/subversion: libsvn_client/commit_util.c libsvn_wc/node.c

[ne...@apache.org]

Author: neels
Date: Mon May  3 12:39:55 2010
New Revision: 940432

URL: http://svn.apache.org/viewvc?rev=940432&view=rev
Log:
Count obstructed deletes as _is_status_deleted, also. Fix a call to
add_committable() that forgot to pass the URL along for obstructed nodes.

* subversion/libsvn_client/commit_util.c
  (harvest_committables): Pass URL to add_committable().

* subversion/libsvn_wc/node.c
  (svn_wc__node_is_status_deleted): Also count obstructed deletes as deleted.

Modified:
    subversion/trunk/subversion/libsvn_client/commit_util.c
    subversion/trunk/subversion/libsvn_wc/node.c

Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=940432&r1=940431&r2=940432&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Mon May  3 12:39:55 2010
@@ -854,7 +854,7 @@ harvest_committables(apr_hash_t *committ
                             {
                               SVN_ERR(add_committable(
                                 committables, this_abspath,
-                                this_kind, NULL,
+                                this_kind, this_url,
                                 SVN_INVALID_REVNUM,
                                 NULL,
                                 SVN_INVALID_REVNUM,

Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=940432&r1=940431&r2=940432&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Mon May  3 12:39:55 2010
@@ -668,8 +668,8 @@ svn_wc__node_is_status_deleted(svn_boole
                                wc_ctx->db, local_abspath,
                                scratch_pool, scratch_pool));
 
-  /* ### Do we need to consider svn_wc__db_status_obstructed_delete? */
-  *is_deleted = (status == svn_wc__db_status_deleted);
+  *is_deleted = (status == svn_wc__db_status_deleted) ||
+                (status == svn_wc__db_status_obstructed_delete);
 
   return SVN_NO_ERROR;
 }