You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/05/14 10:40:08 UTC
svn commit: r1338059 -
/subversion/trunk/subversion/libsvn_client/commit_util.c
Author: julianfoad
Date: Mon May 14 08:40:08 2012
New Revision: 1338059
URL: http://svn.apache.org/viewvc?rev=1338059&view=rev
Log:
* subversion/libsvn_client/commit_util.c
(harvest_not_present_for_copy): Rename inner variables to avoid shadowing
a same-named parameter.
Modified:
subversion/trunk/subversion/libsvn_client/commit_util.c
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1338059&r1=1338058&r2=1338059&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Mon May 14 08:40:08 2012
@@ -479,29 +479,29 @@ harvest_not_present_for_copy(svn_wc_cont
/* We should check if we should really add a delete operation */
if (check_url_func)
{
- svn_revnum_t rev;
- const char *repos_relpath;
- const char *repos_root_url;
+ svn_revnum_t parent_rev;
+ const char *parent_repos_relpath;
+ const char *parent_repos_root_url;
const char *node_url;
/* Determine from what parent we would be the deleted child */
SVN_ERR(svn_wc__node_get_origin(
- NULL, &rev, &repos_relpath,
- &repos_root_url, NULL, NULL,
+ NULL, &parent_rev, &parent_repos_relpath,
+ &parent_repos_root_url, NULL, NULL,
wc_ctx,
svn_dirent_dirname(this_abspath,
scratch_pool),
FALSE, scratch_pool, scratch_pool));
node_url = svn_path_url_add_component2(
- svn_path_url_add_component2(repos_root_url,
- repos_relpath,
+ svn_path_url_add_component2(parent_repos_root_url,
+ parent_repos_relpath,
scratch_pool),
svn_dirent_basename(this_abspath, NULL),
iterpool);
SVN_ERR(check_url_func(check_url_baton, &kind,
- node_url, rev, iterpool));
+ node_url, parent_rev, iterpool));
if (kind == svn_node_none)
continue; /* This node can't be deleted */