Author: rhuijben
Date: Mon Jan 16 23:13:26 2012
New Revision: 1232221
URL: http://svn.apache.org/viewvc?rev=1232221&view=rev
Log:
* subversion/libsvn_wc/status.c
(svn_wc__internal_walk_status): Resolve the regression identified by the test
added in r1232202. An explicit status on a not-present or excluded node
showed a missing status while it should have been handled like a node
that doesn't exist at all.
Modified:
subversion/trunk/subversion/libsvn_wc/status.c
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1232221&r1=1232220&r2=1232221&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Mon Jan 16 23:13:26 2012
@@ -2610,7 +2610,11 @@ svn_wc__internal_walk_status(svn_wc__db_
SVN_ERR(svn_io_stat_dirent(&dirent, local_abspath, TRUE,
scratch_pool, scratch_pool));
- if (info && info->kind == svn_kind_dir)
+ if (info
+ && info->kind == svn_kind_dir
+ && info->status != svn_wc__db_status_not_present
+ && info->status != svn_wc__db_status_excluded
+ && info->status != svn_wc__db_status_server_excluded)
{
SVN_ERR(get_dir_status(&wb,
local_abspath,
