subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1689534 - /subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
Date Tue, 07 Jul 2015 00:27:15 GMT
Author: stefan2
Date: Tue Jul  7 00:27:15 2015
New Revision: 1689534

URL: http://svn.apache.org/r1689534
Log:
On the svn-mergeinfo-normalizer branch:
Fix a major snafu with the m/i redundancy check.

* tools/client-side/svn-mergeinfo-normalizer/logic.c
  (remove_lines): Get the filtered the sub-tree info by filtering the
                  sub-tree info - not the parent info.  Add commentary.

Modified:
    subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c

Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1689534&r1=1689533&r2=1689534&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
(original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
Tue Jul  7 00:27:15 2015
@@ -351,12 +351,19 @@ remove_lines(svn_min__log_t *log,
       SVN_ERR(svn_rangelist_diff(&parent_only, &subtree_only,
                                  parent_ranges, subtree_ranges, FALSE,
                                  iterpool));
+
+      /* From the set of revisions missing on the parent, remove those that
+         don't actually affect the sub-tree.  Those can safely be ignored. */
       subtree_only
-        = svn_min__operative(log, subtree_path, parent_only, iterpool);
+        = svn_min__operative(log, subtree_path, subtree_only, iterpool);
 
+      /* Find revs that are missing in the parent m/i but affect paths
+         outside the sub-tree. */
       operative_outside_subtree
         = svn_min__operative_outside_subtree(log, parent_path, subtree_path,
                                              subtree_only, iterpool);
+
+      /* Find revs that are sub-tree m/i but affect paths in the sub-tree. */
       operative_in_subtree
         = svn_min__operative(log, subtree_path, parent_only, iterpool);
 



Mime
View raw message