svn commit: r1088479 - /subversion/trunk/subversion/libsvn_client/merge.c

[da...@apache.org]

Author: danielsh
Date: Mon Apr  4 05:24:12 2011
New Revision: 1088479

URL: http://svn.apache.org/viewvc?rev=1088479&view=rev
Log:
* subversion/libsvn_client/merge.c
  (get_mergeinfo_paths): Rename local variable to avoid shadowing.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1088479&r1=1088478&r2=1088479&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Apr  4 05:24:12 2011
@@ -5937,7 +5937,7 @@ get_mergeinfo_paths(apr_array_header_t *
      MERGE_CMD_BATON->TARGET_ABSPATH and DEPTH is svn_depth_files. */
   if (depth == svn_depth_immediates || depth == svn_depth_files)
     {
-      int i;
+      int j;
       const apr_array_header_t *immediate_children;
 
       SVN_ERR(svn_wc__node_get_children_of_working_node(
@@ -5947,10 +5947,10 @@ get_mergeinfo_paths(apr_array_header_t *
       if (!iterpool)
         iterpool = svn_pool_create(scratch_pool);
 
-      for (i = 0; i < immediate_children->nelts; i++)
+      for (j = 0; j < immediate_children->nelts; j++)
         {
           const char *immediate_child_abspath =
-            APR_ARRAY_IDX(immediate_children, i, const char *);
+            APR_ARRAY_IDX(immediate_children, j, const char *);
           svn_node_kind_t immediate_child_kind;
 
           svn_pool_clear(iterpool);