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

[cm...@apache.org]

Author: cmpilato
Date: Wed Jan  6 18:42:50 2010
New Revision: 896612

URL: http://svn.apache.org/viewvc?rev=896612&view=rev
Log:
* subversion/libsvn_client/merge.c
  (record_mergeinfo_for_added_subtrees): Lose shadowing variable
    definition (with a comment about the shadowing bit).

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=896612&r1=896611&r2=896612&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jan  6 18:42:50 2010
@@ -7075,7 +7075,7 @@
       const char *added_abspath = svn_apr_hash_index_key(hi);
       const char *dir_abspath;
       svn_mergeinfo_t parent_mergeinfo;
-      svn_boolean_t inherited;
+      svn_boolean_t inherited; /* used multiple times, but ignored */
 
       apr_pool_clear(iterpool);
       dir_abspath = svn_dirent_dirname(added_abspath, iterpool);
@@ -7092,7 +7092,6 @@
           svn_client__merge_path_t *target_merge_path =
             APR_ARRAY_IDX(notify_b->children_with_mergeinfo, 0,
                           svn_client__merge_path_t *);
-          svn_boolean_t inherited;
           svn_merge_range_t *rng;
           svn_node_kind_t added_path_kind;
           svn_mergeinfo_t merge_mergeinfo, added_path_mergeinfo;