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 2012/11/01 19:12:23 UTC
svn commit: r1404703 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Thu Nov 1 18:12:22 2012
New Revision: 1404703
URL: http://svn.apache.org/viewvc?rev=1404703&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(update_moved_away_subtree): Rename local variables child_relpath and
child_moved_to_relpath to child_src_relpath and child_dst_relpath,
respectively. No functional change.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1404703&r1=1404702&r2=1404703&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Thu Nov 1 18:12:22 2012
@@ -511,22 +511,22 @@ update_moved_away_subtree(svn_editor_t *
iterpool = svn_pool_create(scratch_pool);
for (i = 0; i < children->nelts; i++)
{
- const char *child_relpath;
+ const char *child_src_relpath;
svn_kind_t child_kind;
const char *child_dst_op_root_relpath;
- const char *child_moved_to_relpath;
+ const char *child_dst_relpath;
svn_pool_clear(iterpool);
- child_relpath = svn_relpath_join(src_relpath,
- APR_ARRAY_IDX(children, i, const char *),
- iterpool);
+ child_src_relpath = svn_relpath_join(src_relpath,
+ APR_ARRAY_IDX(children, i,
+ const char *),
+ iterpool);
/* Is this child part of our move operation? */
- SVN_ERR(svn_wc__db_scan_deletion_internal(NULL, &child_moved_to_relpath,
- NULL,
+ SVN_ERR(svn_wc__db_scan_deletion_internal(NULL, &child_dst_relpath, NULL,
&child_dst_op_root_relpath,
- wcroot, child_relpath,
+ wcroot, child_src_relpath,
iterpool, iterpool));
if (child_dst_op_root_relpath == NULL ||
strcmp(child_dst_op_root_relpath, move_dst_op_root_relpath) != 0)
@@ -536,18 +536,18 @@ update_moved_away_subtree(svn_editor_t *
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
- wcroot, child_relpath,
+ wcroot, child_src_relpath,
iterpool, iterpool));
if (child_kind == svn_kind_file || child_kind == svn_kind_symlink)
- SVN_ERR(update_moved_away_file(tc_editor, child_relpath,
- child_moved_to_relpath,
+ SVN_ERR(update_moved_away_file(tc_editor, child_src_relpath,
+ child_dst_relpath,
move_dst_op_root_relpath,
move_dst_op_root_revision,
db, wcroot, iterpool));
else if (child_kind == svn_kind_dir)
- SVN_ERR(update_moved_away_subtree(tc_editor, child_relpath,
- child_moved_to_relpath,
+ SVN_ERR(update_moved_away_subtree(tc_editor, child_src_relpath,
+ child_dst_relpath,
move_dst_op_root_relpath,
move_dst_op_root_revision,
db, wcroot, iterpool));