You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/03/04 22:40:44 UTC

svn commit: r1078147 - /subversion/trunk/subversion/libsvn_wc/revision_status.c

Author: stsp
Date: Fri Mar  4 21:40:43 2011
New Revision: 1078147

URL: http://svn.apache.org/viewvc?rev=1078147&view=rev
Log:
Revert a small part of r1076741 to make merge_authz_test 1 pass again.

* subversion/libsvn_wc/revision_status.c
  (analyze_status): We still need to consider absent nodes here, in order
   to return early so that code further down won't try to access them.

Modified:
    subversion/trunk/subversion/libsvn_wc/revision_status.c

Modified: subversion/trunk/subversion/libsvn_wc/revision_status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/revision_status.c?rev=1078147&r1=1078146&r2=1078147&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/revision_status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/revision_status.c Fri Mar  4 21:40:43 2011
@@ -71,10 +71,11 @@ analyze_status(const char *local_abspath
                                NULL, NULL, NULL, NULL, wb->db,
                                local_abspath, scratch_pool, scratch_pool));
 
-  /* We need the excluded paths when checking for sparse checkouts (absent
-   * paths are already taken care of within svn_wc_revision_status2).
-   * But only for that. To collect those we're walking all the hidden nodes. */
-  if (status == svn_wc__db_status_excluded)
+  /* We need the excluded and absent paths when checking for sparse
+   * checkouts. But only for that. To collect those we're walking all the
+   * hidden nodes. */
+  if (status == svn_wc__db_status_excluded
+      || status == svn_wc__db_status_absent)
     {
       wb->result->sparse_checkout = TRUE;
       return SVN_NO_ERROR;