subversion-commits mailing list archives

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

URL: http://svn.apache.org/r1501062
Log:
Merge r1500074 from trunk:

 * r1500074
   Format a path correctly in an error message.
   Justification:
     The error message includes a path not related to the working copy
   Votes:
     +1: danielsh, stsp, ivan

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

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

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1501062&r1=1501061&r2=1501062&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul  9 04:00:10 2013
@@ -120,13 +120,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1500074
-   Format a path correctly in an error message.
-   Justification:
-     The error message includes a path not related to the working copy
-   Votes:
-     +1: danielsh, stsp, ivan
-
  * r1498851
    Provide an explicit error in the serf xml parser when the root element
    isn't matched in the transition table.

Modified: subversion/branches/1.8.x/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/switch.c?rev=1501062&r1=1501061&r2=1501062&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/switch.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/switch.c Tue Jul  9 04:00:10 2013
@@ -241,7 +241,7 @@ switch_internal(svn_revnum_t *result_rev
         return svn_error_createf(SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL,
                                  _("'%s' shares no common ancestry with '%s'"),
                                  switch_url,
-                                 svn_dirent_dirname(local_abspath, pool));
+                                 svn_dirent_local_style(local_abspath, pool));
     }
 
   wcroot_iprops = apr_hash_make(pool);



Mime
View raw message