[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r992042 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_authz_tests.py tests/cmdline/merge_tests.py tests/cmdline/merge_tree_conflict_tests.py tests/cmdline/svntest/actions.py

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 03 Sep 2010 12:43:00 +0100

pburba_at_apache.org writes:

> Author: pburba
> Date: Thu Sep 2 18:10:01 2010
> New Revision: 992042

> @@ -5718,6 +5849,37 @@ get_mergeinfo_paths(apr_array_header_t *
> merge_cmd_baton->ctx->cancel_baton,
> scratch_pool));
>
> + if (apr_hash_count(wb.missing_subtrees))
> + {
> + apr_hash_index_t *hi;
> + apr_pool_t *iterpool = svn_pool_create(scratch_pool);

../src/subversion/libsvn_client/merge.c: In function ‘get_mergeinfo_paths’:
../src/subversion/libsvn_client/merge.c:5855: warning: declaration of ‘iterpool’ shadows a previous local
../src/subversion/libsvn_client/merge.c:5822: warning: shadowed declaration is here

Is the second iterpool deliberate?

-- 
Philip
Received on 2010-09-03 13:43:45 CEST

This is an archived mail posted to the Subversion Dev mailing list.