You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/07/08 14:07:36 UTC
svn commit: r1500680 -
/subversion/trunk/subversion/libsvn_client/diff_local.c
Author: stsp
Date: Mon Jul 8 12:07:35 2013
New Revision: 1500680
URL: http://svn.apache.org/r1500680
Log:
Use local style for paths when formatting error messages from the
'svn diff --old A --new B' commands. Follow-up to r1310291.
* subversion/libsvn_client/diff_local.c
(svn_client__arbitrary_nodes_diff): Use local style for paths when formatting
the "not the same node kind" and "not a file or directory" messages.
Patch by: Evgeny Kotkov <evgeny.kotkov{_AT_}visualsvn.com>
Modified:
subversion/trunk/subversion/libsvn_client/diff_local.c
Modified: subversion/trunk/subversion/libsvn_client/diff_local.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff_local.c?rev=1500680&r1=1500679&r2=1500680&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff_local.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff_local.c Mon Jul 8 12:07:35 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;
}