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

RE: svn commit: r1037748 - in /subversion/trunk/subversion: include/private/svn_mergeinfo_private.h libsvn_subr/mergeinfo.c

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Mon, 22 Nov 2010 15:36:47 +0000

On Mon, 2010-11-22, Bert Huijben wrote:
> > svn_mergeinfo__add_suffix_to_mergeinfo(svn_mergeinfo_t *out_mergeinfo,
> > svn_mergeinfo_t mergeinfo,
> > - const char *suffix,
> > + const char *suffix_relpath,
> > apr_pool_t *result_pool,
> > apr_pool_t *scratch_pool)
> > {
[...]
> > - apr_hash_set(*out_mergeinfo,
> > - svn_dirent_join(path, canonical_suffix,
> > result_pool),
> > - APR_HASH_KEY_STRING,
> > - svn_rangelist_dup(rangelist, result_pool));
> > - }
[...]
> > + apr_hash_set(*out_mergeinfo,
> > + svn_dirent_join(path, suffix_relpath, result_pool),
> > + APR_HASH_KEY_STRING,
> > + svn_rangelist_dup(rangelist, result_pool));
>
> Path is not a dirent (a local disk path), so this should not use the dirent API.
>
> I think this should use the new svn_fspath__ join. (Merge info contains a '/')

Yes - that's why I'm looking at this function! (Note: I didn't touch
that part of it in this commit, just the indentation changed.)

- Julian
Received on 2010-11-22 16:37:41 CET

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