Re: svn commit: rev 1575 - trunk/subversion/include trunk/subversion/libsvn_wc trunk/subversion/libsvn_subr trunk/subversion/libsvn_client

On Thu, Mar 21, 2002 at 02:52:19PM -0600, sussman@tigris.org wrote:
>...
> +++ trunk/subversion/libsvn_wc/log.c Thu Mar 21 14:52:16 2002
>...
> @@ -379,17 +381,23 @@
> right_label = svn_xml_get_attr_value (SVN_WC__LOG_ATTR_ARG_4, atts);
> target_label = svn_xml_get_attr_value (SVN_WC__LOG_ATTR_ARG_5, atts);
>
> + /* Convert the 3 basenames into full paths. */
> + left = svn_path_join (loggy->path->data, left, loggy->pool);
> + right = svn_path_join (loggy->path->data, right, loggy->pool);
> + name = svn_path_join (loggy->path->data, name, loggy->pool);
> +
> /* Now do the merge with our full paths. */
> - err = svn_wc_merge (loggy->path->data,
> - left, right, name,
> + subpool = svn_pool_create (loggy->pool);
> + err = svn_wc_merge (left, right, name,
> left_label, right_label, target_label,
> - loggy->pool);
> + subpool);

Seems like the paths could go into the subpool, too, right?

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org