[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: Bert Huijben <rhuijben_at_sharpsvn.net>
Date: Wed, 23 Sep 2009 23:35:49 +0200

> -----Original Message-----
> From: Greg Stein [mailto:gstein_at_gmail.com]
> Sent: woensdag 23 september 2009 23:04
> To: dev_at_subversion.tigris.org
> Subject: Re: svn commit: r39547 - trunk/subversion/libsvn_wc
>
> 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?

(As answered on IRC:)

Yes it does cause problems, but otherwise it would fail a tiny bit later...

All this because we can't create a diff report on missing/obstructed dirs.

We can probably define a better algorithm when we are on the single db, but we failed before this patch and do now in a slightly different way after the patch.

        Bert

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2399082
Received on 2009-09-23 23:36:12 CEST

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