On Thu, Apr 26, 2012 at 14:07, <pbu...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_client/merge.c Thu Apr 26 18:07:25 2012
>...
> +update_the_list_of_added_subtrees(const char *target_abspath,
> + const char *added_abspath,
> + apr_hash_t **added_abspaths,
> + apr_pool_t *result_pool,
> + apr_pool_t *scratch_pool)
> +{
> + svn_boolean_t root_of_added_subtree = TRUE;
> +
> + /* Stash the root path of any added subtrees. */
> + if (*added_abspaths == NULL)
> + {
> + /* The first added path is always a root. */
> + *added_abspaths = apr_hash_make(result_pool);
> + }
> + else
> + {
> + const char *added_path_parent =
> + svn_dirent_dirname(added_abspath, scratch_pool);
> + apr_pool_t *subpool = svn_pool_create(scratch_pool);
If you flip the order of these two, then ADDED_PATH_PARENT can go into
the subpool.
>...
Cheers,
-g
