subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1476484 - in /subversion/branches/1.8.x: ./ STATUS subversion/svn/info-cmd.c
Date Sat, 27 Apr 2013 04:01:03 GMT
Author: svn-role
Date: Sat Apr 27 04:01:03 2013
New Revision: 1476484

URL: http://svn.apache.org/r1476484
Log:
Merge r1470248 from trunk:

 * r1470248
   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.
   Justification:
     Regression since v1.7.
   Votes:
     +1: julianfoad, rhuijben, pburba

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/svn/info-cmd.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1470248

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1476484&r1=1476483&r2=1476484&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Apr 27 04:01:03 2013
@@ -135,14 +135,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1470248
-   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.
-   Justification:
-     Regression since v1.7.
-   Votes:
-     +1: julianfoad, rhuijben, pburba
-
  * r1471028
    Fix issue 4359, incorrect/missing pack notification.
    Justification:

Modified: subversion/branches/1.8.x/subversion/svn/info-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/info-cmd.c?rev=1476484&r1=1476483&r2=1476484&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/info-cmd.c (original)
+++ subversion/branches/1.8.x/subversion/svn/info-cmd.c Sat Apr 27 04:01:03 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