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

RE: svn commit: r39625 - trunk/subversion/libsvn_wc

From: Bert Huijben <rhuijben_at_sharpsvn.net>
Date: Wed, 7 Oct 2009 23:57:46 +0200

> -----Original Message-----
> From: Greg Stein [mailto:gstein_at_gmail.com]
> Sent: woensdag 7 oktober 2009 23:50
> To: dev_at_subversion.tigris.org
> Subject: Re: svn commit: r39625 - trunk/subversion/libsvn_wc
>
> On Sat, Sep 26, 2009 at 12:31, Hyrum K. Wright <hyrum_at_hyrumwright.org>
> wrote:
> >...
> > +++ trunk/subversion/libsvn_wc/update_editor.c Sat Sep 26 09:31:53
> 2009 (r39625)
> > @@ -1830,23 +1830,27 @@ set_copied_callback(const char *local_ab
> > apr_pool_t *scratch_pool)
> > {
> > struct set_copied_baton_t *b = walk_baton;
> > - const svn_wc_entry_t *entry;
> > + svn_wc__db_status_t status;
> > + svn_wc__db_kind_t kind;
> >
> > if (strcmp(local_abspath, b->added_subtree_root_path) == 0)
> > return SVN_NO_ERROR; /* Don't touch the root */
> >
> > - SVN_ERR(svn_wc__get_entry(&entry, b->eb->db, local_abspath, FALSE,
> > - svn_node_unknown, FALSE,
> > - scratch_pool, scratch_pool));
> > + SVN_ERR(svn_wc__db_read_info(&status, &kind, NULL, NULL, NULL,
> > + NULL, NULL, NULL, NULL, NULL, NULL,
> NULL,
> > + NULL, NULL, NULL, NULL, NULL, NULL,
> NULL,
> > + NULL, NULL, NULL, NULL, NULL,
> > + b->eb->db, local_abspath,
> > + scratch_pool, scratch_pool));
>
> This loses the SHOW_HIDDEN == FALSE concept. Either keep it in, or I'd
> like to know why you can ignore it...
>
> (specifically, I think this might affect depth=exclude? maybe the walk
> doesn't visit parent stubs?)
>
> >...
>
> Of course, it would be Even Better to translate that copied=true flag
> into its wc_db meaning. Without tracing thru the entry-writing code,
> I'm not really sure.

One of the reasons I avoided changing this function is that it will break on switched paths.

I think this tree conflict handling helper needs a redesign, because you don't want local copies of switched paths, etc.

        Bert

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2404708
Received on 2009-10-08 00:00:00 CEST

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