You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/03/11 09:16:42 UTC
svn commit: r921718 - /subversion/trunk/subversion/libsvn_subr/mergeinfo.c
Author: julianfoad
Date: Thu Mar 11 08:16:42 2010
New Revision: 921718
URL: http://svn.apache.org/viewvc?rev=921718&view=rev
Log:
Fix typos.
* subversion/libsvn_subr/mergeinfo.c
(svn_mergeinfo_intersect2): Rename 'consider_ineheritance' to
'consider_inheritance'.
(svn_mergeinfo_remove2): Rename 'consider_ineritance' to
'consider_inheritance'.
Modified:
subversion/trunk/subversion/libsvn_subr/mergeinfo.c
Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=921718&r1=921717&r2=921718&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Thu Mar 11 08:16:42 2010
@@ -1293,7 +1293,7 @@ svn_error_t *
svn_mergeinfo_intersect2(svn_mergeinfo_t *mergeinfo,
svn_mergeinfo_t mergeinfo1,
svn_mergeinfo_t mergeinfo2,
- svn_boolean_t consider_ineheritance,
+ svn_boolean_t consider_inheritance,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -1317,7 +1317,7 @@ svn_mergeinfo_intersect2(svn_mergeinfo_t
if (rangelist2)
{
SVN_ERR(svn_rangelist_intersect(&rangelist2, rangelist1, rangelist2,
- consider_ineheritance, scratch_pool));
+ consider_inheritance, scratch_pool));
if (rangelist2->nelts > 0)
apr_hash_set(*mergeinfo,
apr_pstrdup(result_pool, path),
@@ -1340,13 +1340,13 @@ svn_error_t *
svn_mergeinfo_remove2(svn_mergeinfo_t *mergeinfo,
svn_mergeinfo_t eraser,
svn_mergeinfo_t whiteboard,
- svn_boolean_t consider_ineritance,
+ svn_boolean_t consider_inheritance,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
*mergeinfo = apr_hash_make(result_pool);
return walk_mergeinfo_hash_for_diff(whiteboard, eraser, *mergeinfo, NULL,
- consider_ineritance, result_pool,
+ consider_inheritance, result_pool,
scratch_pool);
}