You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/08/03 20:02:00 UTC
svn commit: r981989 - /subversion/trunk/subversion/libsvn_wc/status.c
Author: rhuijben
Date: Tue Aug 3 18:02:00 2010
New Revision: 981989
URL: http://svn.apache.org/viewvc?rev=981989&view=rev
Log:
* subversion/libsvn_wc/status.c
(get_dir_status): Following up on r981893, remove !Single-DB block and an
inaccurate comment. Hidden is not a parent-stub status.
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=981989&r1=981988&r2=981989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue Aug 3 18:02:00 2010
@@ -1288,18 +1288,6 @@ get_dir_status(const struct walk_status_
NULL, NULL, NULL, NULL, NULL, NULL,
wb->db, node_abspath, iterpool, iterpool));
-#ifndef SVN_WC__SINGLE_DB
- /* Hidden looks in the parent stubs, which should not be necessary.
- Also skip excluded/absent/not-present working nodes, which
- only have an implied status via their parent. */
-
- SVN_ERR(svn_wc__db_node_hidden(&hidden, wb->db, node_abspath,
- iterpool));
-
- if (hidden)
- node_status = svn_wc__db_status_not_present;
-#endif
-
if (node_status != svn_wc__db_status_not_present
&& node_status != svn_wc__db_status_excluded
&& node_status != svn_wc__db_status_absent)
Re: svn commit: r981989 - /subversion/trunk/subversion/libsvn_wc/status.c
Posted by Greg Stein <gs...@gmail.com>.
On Tue, Aug 3, 2010 at 14:02, <rh...@apache.org> wrote:
> Author: rhuijben
> Date: Tue Aug 3 18:02:00 2010
> New Revision: 981989
>
> URL: http://svn.apache.org/viewvc?rev=981989&view=rev
> Log:
> * subversion/libsvn_wc/status.c
> (get_dir_status): Following up on r981893, remove !Single-DB block and an
> inaccurate comment. Hidden is not a parent-stub status.
I'm not sure this message is correct. Hidden can certainly be a
parent-stub status. For a not-present directory (entry->deleted), it
is "hidden".
I suspect in this case, wc_db reads the stub and returns not-present.
But it *is* reading the stub, so maybe your log message should say
something different? (and verify the code *is* doing what I
hypothesize)
Cheers,
-g