svn commit: r941660 - /subversion/trunk/subversion/libsvn_client/commit_util.c

[ph...@apache.org]

Author: philip
Date: Thu May  6 11:11:26 2010
New Revision: 941660

URL: http://svn.apache.org/viewvc?rev=941660&view=rev
Log:
* subversion/libsvn_client/commit_util.c
  (harvest_committables): Use a wc-ng call instead of an entry field.

Modified:
    subversion/trunk/subversion/libsvn_client/commit_util.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=941660&r1=941659&r2=941660&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Thu May  6 11:11:26 2010
@@ -750,7 +750,7 @@ harvest_committables(apr_hash_t *committ
           const svn_wc_entry_t *this_entry;
           const char *this_url, *this_cf_url = cf_url ? cf_url : copyfrom_url;
           svn_depth_t this_depth;
-          svn_boolean_t this_is_deleted;
+          svn_boolean_t is_replaced, this_is_deleted;
           svn_node_kind_t this_kind;
           svn_error_t *err;
 
@@ -835,7 +835,9 @@ harvest_committables(apr_hash_t *committ
            * ### already. */
           SVN_ERR(svn_wc__node_is_status_deleted(&this_is_deleted, ctx->wc_ctx,
                                                  this_abspath, iterpool));
-          if (entry->schedule == svn_wc_schedule_replace && this_is_deleted)
+          SVN_ERR(svn_wc__node_is_replaced(&is_replaced, ctx->wc_ctx,
+                                           local_abspath, iterpool));
+          if (is_replaced && this_is_deleted)
             continue;
 
           if (this_cf_url)