svn commit: r1092327 - /subversion/trunk/subversion/libsvn_client/status.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Apr 14 15:12:05 2011
New Revision: 1092327

URL: http://svn.apache.org/viewvc?rev=1092327&view=rev
Log:
While working on a test for the remote deleted, locally added block I
accidentally broke in r1092294, fix a few issues.

* subversion/libsvn_client/status.c
  (tweak_status): Following up on r955542, tweak the node status instead of the
    text status.
  (svn_client_status_5): Following up on r1092294, reinsert the added check.

Modified:
    subversion/trunk/subversion/libsvn_client/status.c

Modified: subversion/trunk/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=1092327&r1=1092326&r2=1092327&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Thu Apr 14 15:12:05 2011
@@ -91,7 +91,7 @@ tweak_status(void *baton,
   if (sb->deleted_in_repos)
     {
       svn_wc_status3_t *new_status = svn_wc_dup_status3(status, scratch_pool);
-      new_status->repos_text_status = svn_wc_status_deleted;
+      new_status->repos_node_status = svn_wc_status_deleted;
       status = new_status;
     }
 
@@ -419,7 +419,8 @@ svn_client_status5(svn_revnum_t *result_
              versioned, then it must have since been deleted from the
              repository.  (Note that "locally replaced" doesn't count
              as "added" in this case.)  */
-
+          SVN_ERR(svn_wc__node_is_added(&added, ctx->wc_ctx,
+                                        dir_abspath, pool));
           if (! added)
             sb.deleted_in_repos = TRUE;