diff options
| author | peter <peter@FreeBSD.org> | 2013-07-28 05:04:41 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-07-28 05:04:41 +0000 |
| commit | 3b9f7e96381479fb03ae2c36d490a38718f71083 (patch) | |
| tree | a851d66ec0c51a7321b30a677a0e55f1655af4d6 /subversion/libsvn_client/diff_local.c | |
| parent | 6879a90da0ad9b5e74fc212c899751fe3821ac7b (diff) | |
| download | FreeBSD-src-3b9f7e96381479fb03ae2c36d490a38718f71083.zip FreeBSD-src-3b9f7e96381479fb03ae2c36d490a38718f71083.tar.gz | |
Import subversion-1.8.1 into vendor staging area.
Diffstat (limited to 'subversion/libsvn_client/diff_local.c')
| -rw-r--r-- | subversion/libsvn_client/diff_local.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/subversion/libsvn_client/diff_local.c b/subversion/libsvn_client/diff_local.c index cc7184f..2dd8a1b 100644 --- a/subversion/libsvn_client/diff_local.c +++ b/subversion/libsvn_client/diff_local.c @@ -607,7 +607,10 @@ svn_client__arbitrary_nodes_diff(const char *local_abspath1, 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 char *local_abspath1, 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; } |
