subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1569731 - /subversion/trunk/subversion/libsvn_subr/mergeinfo.c
Date Wed, 19 Feb 2014 13:06:07 GMT
Author: julianfoad
Date: Wed Feb 19 13:06:06 2014
New Revision: 1569731

URL: http://svn.apache.org/r1569731
Log:
Fix a mergeinfo calculation bug introduced in r878906. The bug had no
adverse effect in the current trunk Subversion code.

The function svn_rangelist_inheritable2() was changing the inheritability of
the remaining non-inheritable ranges to TRUE when removing all inheritable
ranges from a rangelist. I found this by code inspection. The only caller
that exercises this code path in current trunk Subversion code is
svn_client__mergeinfo_log(), via svn_mergeinfo_inheritable2(inheritable=
FALSE), and it ignores inheritance on the result so there is no net effect.

* subversion/libsvn_subr/mergeinfo.c
  (svn_rangelist_inheritable2): Don't change the inheritability of remaining
    ranges.

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=1569731&r1=1569730&r2=1569731&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Wed Feb 19 13:06:06 2014
@@ -2103,7 +2103,7 @@ svn_rangelist_inheritable2(svn_rangelist
                     apr_palloc(result_pool, sizeof(*inheritable_range));
                   inheritable_range->start = range->start;
                   inheritable_range->end = range->end;
-                  inheritable_range->inheritable = TRUE;
+                  inheritable_range->inheritable = range->inheritable;
                   APR_ARRAY_PUSH(*inheritable_rangelist,
                                  svn_merge_range_t *) = range;
                 }



Mime
View raw message