subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1470248 - /subversion/trunk/subversion/svn/info-cmd.c
Date Sat, 20 Apr 2013 22:57:44 GMT
Author: julianfoad
Date: Sat Apr 20 22:57:44 2013
New Revision: 1470248

URL: http://svn.apache.org/r1470248
Log:
Fix a little error in 'svn info' whereby it would print the path to the
'.prej' file multiple times if multiple properties were in conflict.  This
seems to be a regression since v1.7.

* subversion/svn/info-cmd.c
  (print_info): Print the path to the prop conflict reject file only once.

Modified:
    subversion/trunk/subversion/svn/info-cmd.c

Modified: subversion/trunk/subversion/svn/info-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1470248&r1=1470247&r2=1470248&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Sat Apr 20 22:57:44 2013
@@ -438,6 +438,7 @@ print_info(void *baton,
 
       if (info->wc_info->conflicts)
         {
+          svn_boolean_t printed_prop_conflict_file = FALSE;
           int i;
 
           for (i = 0; i < info->wc_info->conflicts->nelts; i++)
@@ -473,10 +474,12 @@ print_info(void *baton,
                   break;
 
                   case svn_wc_conflict_kind_property:
-                    SVN_ERR(svn_cmdline_printf(pool,
-                              _("Conflict Properties File: %s\n"),
-                              svn_dirent_local_style(conflict->their_abspath,
-                                                     pool)));
+                    if (! printed_prop_conflict_file)
+                      SVN_ERR(svn_cmdline_printf(pool,
+                                _("Conflict Properties File: %s\n"),
+                                svn_dirent_local_style(conflict->their_abspath,
+                                                       pool)));
+                    printed_prop_conflict_file = TRUE;
                   break;
 
                   case svn_wc_conflict_kind_tree:



Mime
View raw message