svn commit: r1723324 - /subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c

[st...@apache.org]

Author: stefan2
Date: Wed Jan  6 13:56:30 2016
New Revision: 1723324

URL: http://svn.apache.org/viewvc?rev=1723324&view=rev
Log:
Minor UI and docstring tweaks in svn-mergeinfo-normalizer.
No functional change intended.

* tools/client-side/svn-mergeinfo-normalizer/logic.c
  (show_removing_obsoletes): Don't claim that we will actually remove
                             all these entries because we often won't.
  (remove_obsolete_line): Clarify docstring w.r.t. LOCAL_ONLY. 
  (show_elision_result,
   show_obsoletes_summary): Make wording in our output account for the
                            case that there is only one such branch.

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

Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1723324&r1=1723323&r2=1723324&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c (original)
+++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c Wed Jan  6 13:56:30 2016
@@ -305,7 +305,7 @@ show_removing_obsoletes(svn_min__opt_sta
       && progress->needs_header)
     {
       SVN_ERR(svn_cmdline_printf(scratch_pool,
-                                _("\n    Removing obsolete entries ...\n")));
+                       _("\n    Trying to remove obsolete entries ...\n")));
       progress->needs_header = FALSE;
     }
 
@@ -498,9 +498,11 @@ find_surviving_copies(apr_array_header_t
  * enabled in it.
  *
  * If LOCAL_ONLY is set, only remove branches that are known to have been
- * deleted as per LOOKUP - this is for quick checks.  Track progress in
- * PROGRESS and update MERGEINFO is we can remove the info for branch PATH
- * from it.
+ * deleted (as per LOOKUP) with no surviving copies etc.  This is for quick
+ * checks.
+ *
+ * Track progress in PROGRESS and update MERGEINFO if we can remove the
+ * info for branch PATH from it.
  *
  * Use SCRATCH_POOL for temporaries.
  */
@@ -1339,10 +1341,10 @@ show_elision_result(svn_mergeinfo_t pare
           if (parent_mergeinfo)
             SVN_ERR(svn_cmdline_printf(scratch_pool,
                       _("\n    Sub-tree merge info cannot be elided due to "
-                        "the following branches:\n")));
+                        "the following branche(s):\n")));
           else
             SVN_ERR(svn_cmdline_printf(scratch_pool,
-                  _("\n    Merge info kept for the following branches:\n")));
+                _("\n    Merge info kept for the following branche(s):\n")));
 
           sorted_mi = svn_sort__hash(subtree_mergeinfo,
                                     svn_sort_compare_items_lexically,
@@ -1606,7 +1608,7 @@ show_obsoletes_summary(svn_min__branch_l
   iterpool = svn_pool_create(scratch_pool);
 
   SVN_ERR(svn_cmdline_printf(iterpool,
-                             _("\nEncountered %d missing branches:\n"),
+                             _("\nEncountered %d missing branche(s):\n"),
                              paths->nelts));
   for (i = 0; i < paths->nelts; ++i)
     {