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

Re: svn commit: r40213 - trunk/subversion/libsvn_client

From: Paul Burba <ptburba_at_gmail.com>
Date: Tue, 27 Oct 2009 14:55:48 -0400

On Sat, Oct 24, 2009 at 11:47 AM, Greg Stein <gstein_at_gmail.com> wrote:
> On Fri, Oct 23, 2009 at 23:13, Paul T. Burba <pburba_at_collab.net> wrote:
>>...
>> +++ trunk/subversion/libsvn_client/merge.c      Fri Oct 23 20:13:32 2009        (r40213)
>>...
>> @@ -4288,11 +4286,11 @@ calculate_merge_inheritance(apr_array_he
>>  }
>>
>>  /* Calculate the new mergeinfo for the target tree based on the merge
>> -   info for TARGET_WCPATH and MERGES (a mapping of WC paths to range
>> +   info for TARGET_ABSPATH and MERGES (a mapping of WC paths to range
>>    lists), and record it in the WC (at, and possibly below,
>> -   TARGET_WCPATH). */
>> +   TARGET_ABSPATH). */
>>  static svn_error_t *
>> -update_wc_mergeinfo(const char *target_wcpath,
>> +update_wc_mergeinfo(const char *target_abspath,
>>                     const char *repos_rel_path,
>>                     apr_hash_t *merges,
>>                     svn_boolean_t is_rollback,
>> @@ -4358,7 +4356,7 @@ update_wc_mergeinfo(const char *target_w
>>
>>       /* ASSUMPTION: "target_wcpath" is always both a parent and
>>          prefix of "path". */
>> -      len = strlen(target_wcpath);
>> +      len = strlen(target_abspath);
>>       if (len < strlen(path))
>
> This is looking a bit hinky. The TARGET_ABSPATH parameter is used just
> *once* in this function? And all that is done with it, is to get the
> length? What?
>
>>...
>
> Cheers,
> -g

Hi Greg,

I fixed the above and a few similar instances in r40236.

Paul

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2411759
Received on 2009-10-27 19:56:04 CET

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