svn commit: r1459396 - /subversion/trunk/subversion/svn/notify.c

[ju...@apache.org]

Author: julianfoad
Date: Thu Mar 21 16:47:05 2013
New Revision: 1459396

URL: http://svn.apache.org/r1459396
Log:
Tweak the summary of conflicts.  If any conflicts were resolved during the
merge, and thus we are using the long form of message -- '%d remaining (and
%d already resolved)' -- then use that form of message for all three kinds
of conflict.  This should make the meaning slighlty clearer.

* subversion/svn/notify.c
  (svn_cl__notifier_print_conflict_stats): As above.

Modified:
    subversion/trunk/subversion/svn/notify.c

Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1459396&r1=1459395&r2=1459396&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Thu Mar 21 16:47:05 2013
@@ -107,35 +107,32 @@ svn_cl__notifier_print_conflict_stats(vo
     SVN_ERR(svn_cmdline_printf(scratch_pool,
                                _("Summary of conflicts:\n")));
 
-  if (n_text > 0 || n_text_r > 0)
+  if (n_text_r == 0 && n_prop_r == 0 && n_tree_r == 0)
     {
-      if (n_text_r == 0)
+      if (n_text > 0)
         SVN_ERR(svn_cmdline_printf(scratch_pool,
           _("  Text conflicts: %d\n"),
           n_text));
-      else
-        SVN_ERR(svn_cmdline_printf(scratch_pool,
-          _("  Text conflicts: %d remaining (and %d already resolved)\n"),
-          n_text, n_text_r));
-    }
-  if (n_prop > 0 || n_prop_r > 0)
-    {
-      if (n_prop_r == 0)
+      if (n_prop > 0)
         SVN_ERR(svn_cmdline_printf(scratch_pool,
           _("  Property conflicts: %d\n"),
           n_prop));
-      else
+      if (n_tree > 0)
         SVN_ERR(svn_cmdline_printf(scratch_pool,
-          _("  Property conflicts: %d remaining (and %d already resolved)\n"),
-          n_prop, n_prop_r));
+          _("  Tree conflicts: %d\n"),
+          n_tree));
     }
-  if (n_tree > 0 || n_tree_r > 0)
+  else
     {
-      if (n_tree_r == 0)
+      if (n_text > 0 || n_text_r > 0)
         SVN_ERR(svn_cmdline_printf(scratch_pool,
-          _("  Tree conflicts: %d\n"),
-          n_tree));
-      else
+          _("  Text conflicts: %d remaining (and %d already resolved)\n"),
+          n_text, n_text_r));
+      if (n_prop > 0 || n_prop_r > 0)
+        SVN_ERR(svn_cmdline_printf(scratch_pool,
+          _("  Property conflicts: %d remaining (and %d already resolved)\n"),
+          n_prop, n_prop_r));
+      if (n_tree > 0 || n_tree_r > 0)
         SVN_ERR(svn_cmdline_printf(scratch_pool,
           _("  Tree conflicts: %d remaining (and %d already resolved)\n"),
           n_tree, n_tree_r));