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

Re: svn commit: r37627 - in trunk/subversion: include libsvn_client libsvn_subr tests/cmdline

From: Paul Burba <ptburba_at_gmail.com>
Date: Mon, 18 May 2009 13:29:47 -0400

On Thu, May 7, 2009 at 1:20 PM, Arfrever Frehtes Taifersar Arahesis
<Arfrever.FTA_at_gmail.com> wrote:
> 2009-05-06 21:44 Paul T. Burba <pburba_at_collab.net> napisał(a):
>> ...
>> --- trunk/subversion/include/svn_mergeinfo.h    Wed May  6 12:41:45 2009        (r37626)
>> +++ trunk/subversion/include/svn_mergeinfo.h    Wed May  6 12:44:15 2009        (r37627)
>> @@ -202,15 +202,33 @@ svn_error_t *
>>  svn_mergeinfo_merge(svn_mergeinfo_t mergeinfo, svn_mergeinfo_t changes,
>>                     apr_pool_t *pool);
>>
>> -/** Removes @a eraser (the subtrahend) from @a whiteboard (the
>> - * minuend), and places the resulting difference in @a *mergeinfo.
>> +/** Like svn_mergeinfo_remove2, but always considers inheritance.
>>  *
>> - * @since New in 1.5.
>> + * @deprecated Provided for backward compatibility with the 1.5 API.
>>  */
>
> You should add SVN_DEPRECATED here...
>
>>  svn_error_t *
>>  svn_mergeinfo_remove(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t eraser,
>>                      svn_mergeinfo_t whiteboard, apr_pool_t *pool);
>>
>> +/** Removes @a eraser (the subtrahend) from @a whiteboard (the
>> + * minuend), and places the resulting difference in @a *mergeinfo.
>> + * Allocates @a *mergeinfo in @a result_pool.  Temporary allocations
>> + * will be performed in @a scratch_pool.
>> + *
>> + * @a consider_inheritance determines how to account for the inheritability
>> + * of the two mergeinfo's ranges when calculating the range equivalence,
>> + * as described for svn_mergeinfo_diff().
>> + *
>> + * @since New in 1.7.
>> + */
>> +svn_error_t *
>> +svn_mergeinfo_remove2(svn_mergeinfo_t *mergeinfo,
>> +                      svn_mergeinfo_t eraser,
>> +                      svn_mergeinfo_t whiteboard,
>> +                      svn_boolean_t consider_inheritance,
>> +                      apr_pool_t *result_pool,
>> +                      apr_pool_t *scratch_pool);
>> +
>>  /** Calculate the delta between two rangelists consisting of @c
>>  * svn_merge_range_t * elements (sorted in ascending order), @a from
>>  * and @a to, and place the result in @a *deleted and @a *added
>> @@ -267,11 +285,9 @@ svn_rangelist_remove(apr_array_header_t
>>                      svn_boolean_t consider_inheritance,
>>                      apr_pool_t *pool);
>>
>> -/** Find the intersection of two mergeinfos, @a mergeinfo1 and @a
>> - * mergeinfo2, and place the result in @a *mergeinfo, which is (deeply)
>> - * allocated in @a pool.
>> +/** Like svn_mergeinfo_intersect2, but always considers inheritance.
>>  *
>> - * @since New in 1.5.
>> + * @deprecated Provided for backward compatibility with the 1.5 API.
>>  */
>
> ... and here.

Done r37772.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2301853
Received on 2009-05-18 19:30:32 CEST

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