You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/09/26 04:34:22 UTC
Re: svn commit: r39613 - trunk/subversion/libsvn_wc
On Fri, Sep 25, 2009 at 17:24, Hyrum K. Wright <hy...@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.
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2400490
Re: svn commit: r39613 - trunk/subversion/libsvn_wc
Posted by Greg Stein <gs...@gmail.com>.
On Sat, Sep 26, 2009 at 00:34, Greg Stein <gs...@gmail.com> wrote:
> On Fri, Sep 25, 2009 at 17:24, Hyrum K. Wright <hy...@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