subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1695553 - /subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
Date Wed, 12 Aug 2015 15:13:10 GMT
Author: stefan2
Date: Wed Aug 12 15:13:09 2015
New Revision: 1695553

URL: http://svn.apache.org/r1695553
Log:
On the svn-mergeinfo-normalizer branch:

* tools/client-side/svn-mergeinfo-normalizer/logic.c
  (normalize): Ensure we always show the elision result based on the
               modified mergeinfo.

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=1695553&r1=1695552&r2=1695553&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
Wed Aug 12 15:13:09 2015
@@ -924,6 +924,7 @@ normalize(apr_array_header_t *wc_mergein
       svn_mergeinfo_t parent_mergeinfo;
       svn_mergeinfo_t subtree_mergeinfo;
       svn_mergeinfo_t subtree_mergeinfo_copy;
+      svn_mergeinfo_t mergeinfo_to_report;
 
       svn_pool_clear(iterpool);
       progress.nodes_todo = i;
@@ -943,6 +944,7 @@ normalize(apr_array_header_t *wc_mergein
       if (opt_state->remove_redundants && parent_mergeinfo)
         {
           svn_mergeinfo_t parent_mergeinfo_copy;
+          mergeinfo_to_report = subtree_mergeinfo_copy;
 
           /* Try to elide the mergeinfo for all branches. */
           parent_mergeinfo_copy = svn_mergeinfo_dup(parent_mergeinfo,
@@ -976,6 +978,7 @@ normalize(apr_array_header_t *wc_mergein
       else
         {
           /* Eliminate deleted branches. */
+          mergeinfo_to_report = subtree_mergeinfo;
           SVN_ERR(remove_obsolete_lines(lookup, log, subtree_mergeinfo,
                                         opt_state, &progress, FALSE,
                                         iterpool));
@@ -986,7 +989,7 @@ normalize(apr_array_header_t *wc_mergein
                             iterpool));
 
       /* Display what's left. */
-      SVN_ERR(show_elision_result(parent_mergeinfo, subtree_mergeinfo_copy,
+      SVN_ERR(show_elision_result(parent_mergeinfo, mergeinfo_to_report,
                                   opt_state, scratch_pool));
 
       /* Print progress info. */



Mime
View raw message