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