[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 23 Sep 2009 17:04:08 -0400

On Wed, Sep 23, 2009 at 16:06, Bert Huijben <rhuijben_at_sharpsvn.net> wrote:
>...
> +++ trunk/subversion/libsvn_wc/diff.c   Wed Sep 23 13:06:53 2009        (r39547)
>...
> @@ -791,16 +790,19 @@ directory_elements_diff(struct dir_baton
>           && strcmp(dir_baton->edit_baton->target, name))
>         continue;
>
> -      path = svn_dirent_join(dir_baton->path, name, subpool);
> +      path = svn_dirent_join(dir_baton->path, name, iterpool);
>
>       /* Skip entry if it is in the list of entries already diff'd. */
>       if (apr_hash_get(dir_baton->compared, path, APR_HASH_KEY_STRING))
>         continue;
>
> +      SVN_ERR(svn_wc__get_entry(&entry, eb->db, child_abpath, FALSE,
> +                                svn_node_unknown, FALSE, iterpool, iterpool));

Isn't this going to cause problems with missing/obstructed child subdirs?

>...
> -      /* Skip entry for the directory itself. */
> -      if (strcmp(key, SVN_WC_ENTRY_THIS_DIR) == 0)
> +      SVN_ERR(svn_wc__db_node_hidden(&hidden, eb->db, child_abspath,
> +                                     iterpool));
> +
> +      if (hidden)
>         continue;
>
> +      SVN_ERR(svn_wc__get_entry(&entry, eb->db, child_abspath, FALSE,
> +                                svn_node_unknown, FALSE, iterpool, iterpool));

And here.

The hidden check won't catch the issue.

>...

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2399071
Received on 2009-09-23 23:04:16 CEST

This is an archived mail posted to the Subversion Dev mailing list.