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

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

From: Greg Stein <gstein_at_gmail.com>
Date: Sat, 26 Sep 2009 00:36:33 -0400

On Sat, Sep 26, 2009 at 00:34, Greg Stein <gstein_at_gmail.com> wrote:
> On Fri, Sep 25, 2009 at 17:24, Hyrum K. Wright <hyrum_at_hyrumwright.org> wrote:
>>...
>> +++ trunk/subversion/libsvn_wc/props.c  Fri Sep 25 14:24:31 2009        (r39613)
>> @@ -247,20 +247,18 @@ append_prop_conflict(svn_stream_t *strea
>>    name of that file, or to NULL if no such file exists. */
>>  static svn_error_t *
>>  get_existing_prop_reject_file(const char **reject_file,
>> -                              svn_wc_adm_access_t *adm_access,
>> -                              const char *path,
>> +                              svn_wc__db_t *db,
>> +                              const char *adm_abspath,
>> +                              const char *local_abspath,
>>                               apr_pool_t *pool)
>
> eh? what's the ADM_ABSPATH for? most functions never need to worry
> about where their admin data is.

Ah. I see it in the join().

I really don't think you want to pass "adm_abspath". IMO, that refers
to administrative stuff. In this context, it is simply the directory
where the prop reject file is located. There is also a very good
argument that wc_db should be returned an abspath, so this kind of
join shouldn't be needed.

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2400491
Received on 2009-09-26 06:36:44 CEST

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