Re: svn commit: r34084 - trunk/subversion/libsvn_wc

On Thu, 2008-11-06 at 13:02 -0800, julianfoad_at_tigris.org wrote:
> Author: julianfoad
> Date: Thu Nov 6 13:02:19 2008
> New Revision: 34084
>
> Log:
> Correct a bug in the WC entries walker. In "show_hidden" mode, it tried to
> recurse into a 'deleted' or 'absent' directory.
>
> * subversion/libsvn_wc/entries.c
> (walker_helper): Do not try to recurse into a 'deleted' or 'absent'
> directory.
>
> Modified: trunk/subversion/libsvn_wc/entries.c

> @@ -3206,6 +3206,7 @@ walker_helper(const char *dirpath,
>
> /* Recurse into this entry if appropriate. */
> if (current_entry->kind == svn_node_dir
> + && !current_entry->deleted && !current_entry->absent
> && depth >= svn_depth_immediates)
> {
> svn_wc_adm_access_t *entry_access;

Hmm. I think this should be

          && !((current_entry->deleted || current_entry->absent)
               && current_entry->schedule != svn_wc_schedule_delete)

so that we can recurse into a deleted-but-re-added dir.

That little definition of what constitutes a "hidden" entry ought to be
codified rather that written out verbatim wherever it's needed. I wonder
if there are more places where it's missing, or where it only partially
appears like my first attempt there.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-07 12:11:54 CET