subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1501060 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_client/diff_local.c
Date Tue, 09 Jul 2013 04:00:08 GMT
Author: svn-role
Date: Tue Jul  9 04:00:08 2013
New Revision: 1501060

URL: http://svn.apache.org/r1501060
Log:
Merge r1500680 from trunk:

 * r1500680
   Use local style for paths in error messages for 'svn diff --old A --new B'
   Justification:
     Errors show paths with wrong separators on some platforms.
   Votes:
     +1: stsp, danielsh, stefan2, breser

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_client/diff_local.c

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

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1501060&r1=1501059&r2=1501060&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul  9 04:00:08 2013
@@ -120,13 +120,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1500680
-   Use local style for paths in error messages for 'svn diff --old A --new B'
-   Justification:
-     Errors show paths with wrong separators on some platforms.
-   Votes:
-     +1: stsp, danielsh, stefan2, breser
-
  * r1491739, r1491755, r1491762, r1492152
    Improve interactive conflict resolution menu.
    Justification:

Modified: subversion/branches/1.8.x/subversion/libsvn_client/diff_local.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/diff_local.c?rev=1501060&r1=1501059&r2=1501060&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/diff_local.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/diff_local.c Tue Jul  9 04:00:08 2013
@@ -607,7 +607,10 @@ svn_client__arbitrary_nodes_diff(const c
   if (kind1 != kind2)
     return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
                              _("'%s' is not the same node kind as '%s'"),
-                             local_abspath1, local_abspath2);
+                             svn_dirent_local_style(local_abspath1,
+                                                    scratch_pool),
+                             svn_dirent_local_style(local_abspath2,
+                                                    scratch_pool));
 
   if (depth == svn_depth_unknown)
     depth = svn_depth_infinity;
@@ -627,7 +630,10 @@ svn_client__arbitrary_nodes_diff(const c
   else
     return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
                              _("'%s' is not a file or directory"),
-                             kind1 == svn_node_none ?
-                              local_abspath1 : local_abspath2);
+                             kind1 == svn_node_none
+                               ? svn_dirent_local_style(local_abspath1,
+                                                        scratch_pool)
+                               : svn_dirent_local_style(local_abspath2,
+                                                        scratch_pool));
   return SVN_NO_ERROR;
 }



Mime
View raw message