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

Re: svn commit: r1331003 - /subversion/trunk/subversion/libsvn_client/merge.c

From: Paul Burba <ptburba_at_gmail.com>
Date: Mon, 30 Apr 2012 12:56:41 -0400

On Thu, Apr 26, 2012 at 3:12 PM, Greg Stein <gstein_at_gmail.com> wrote:
> On Thu, Apr 26, 2012 at 14:07,  <pburba_at_apache.org> wrote:
>>...
>> +++ subversion/trunk/subversion/libsvn_client/merge.c Thu Apr 26 18:07:25 2012
>>...
>> +update_the_list_of_added_subtrees(const char *target_abspath,
>> +                                  const char *added_abspath,
>> +                                  apr_hash_t **added_abspaths,
>> +                                  apr_pool_t *result_pool,
>> +                                  apr_pool_t *scratch_pool)
>> +{
>> +  svn_boolean_t root_of_added_subtree = TRUE;
>> +
>> +  /* Stash the root path of any added subtrees. */
>> +  if (*added_abspaths == NULL)
>> +    {
>> +      /* The first added path is always a root. */
>> +      *added_abspaths = apr_hash_make(result_pool);
>> +    }
>> +  else
>> +    {
>> +      const char *added_path_parent =
>> +        svn_dirent_dirname(added_abspath, scratch_pool);
>> +      apr_pool_t *subpool = svn_pool_create(scratch_pool);
>
> If you flip the order of these two, then ADDED_PATH_PARENT can go into
> the subpool.

Quite right, done in r1332290.

Paul

>>...
>
> Cheers,
> -g
Received on 2012-04-30 18:57:14 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.