Re: svn commit: r27982 - in branches/issue-2897/subversion: include include/private libsvn_client libsvn_fs libsvn_fs_base libsvn_fs_fs libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_neon libsvn_ra_serf libsvn_ra_svn libsvn_repos mod_dav_svn mod_

On Nov 22, 2007 11:35 AM, <kameshj@tigris.org> wrote:
> Author: kameshj
> Date: Thu Nov 22 11:35:07 2007
> New Revision: 27982
>
> Log:
> On issue-2897 branch: Fix 2897 Reflective merges are faulty.
>

> @@ -204,10 +251,24 @@
> {
> const void *path;
> void *mergeinfo;
> + apr_hash_t *curr_mergeinfo;
> + apr_hash_t *orig_mergeinfo_for_path;
> + apr_hash_t *added_mergeinfo_for_path;
> + apr_hash_t *deleted_mergeinfo_for_path;
>
> apr_hash_this(hi, &path, NULL, &mergeinfo);
> + orig_mergeinfo_for_path = apr_hash_get(orig_mergeinfo_for_paths, path,
> + APR_HASH_KEY_STRING);
> + SVN_ERR(svn_mergeinfo_parse(&curr_mergeinfo,
> + ((svn_string_t *)mergeinfo)->data,pool));
> + SVN_ERR(svn_mergeinfo_diff(&deleted_mergeinfo_for_path,
> + &added_mergeinfo_for_path,
> + orig_mergeinfo_for_path, curr_mergeinfo, TRUE,
> + pool));
> SVN_ERR(index_path_mergeinfo(new_rev, db, (const char *) path,
> - (svn_string_t *) mergeinfo, pool));
> + curr_mergeinfo, orig_mergeinfo_for_path,
> + added_mergeinfo_for_path, pool));
> +
> }

This loop in index_txn_mergeinfo needs to use an iterpool.

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org