You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2015/01/29 17:53:27 UTC
svn commit: r1655738 - /subversion/trunk/subversion/libsvn_client/externals.c
Author: brane
Date: Thu Jan 29 16:53:26 2015
New Revision: 1655738
URL: http://svn.apache.org/r1655738
Log:
Follow up to r1655712 by making the original form of the external
reference URL available for constructing the error message.
Patch by: stsp
* subversion/libsvn_client/externals.c
(switch_dir_external): Add new argument url_from_externals_definition.
(handle_external_item_change): Update the only caller.
Modified:
subversion/trunk/subversion/libsvn_client/externals.c
Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1655738&r1=1655737&r2=1655738&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Thu Jan 29 16:53:26 2015
@@ -146,6 +146,7 @@ relegate_dir_external(svn_wc_context_t *
static svn_error_t *
switch_dir_external(const char *local_abspath,
const char *url,
+ const char *url_from_externals_definition,
const svn_opt_revision_t *peg_revision,
const svn_opt_revision_t *revision,
const char *defining_abspath,
@@ -201,7 +202,8 @@ switch_dir_external(const char *local_ab
_("The external '%s' defined in %s at '%s' "
"cannot be checked out because '%s' is "
"already a versioned path."),
- url, SVN_PROP_EXTERNALS,
+ url_from_externals_definition,
+ SVN_PROP_EXTERNALS,
svn_dirent_local_style(defining_abspath,
pool),
svn_dirent_local_style(local_abspath,
@@ -800,6 +802,7 @@ handle_external_item_change(svn_client_c
{
case svn_node_dir:
SVN_ERR(switch_dir_external(local_abspath, new_loc->url,
+ new_item->url,
&(new_item->peg_revision),
&(new_item->revision),
parent_dir_abspath,