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

Re: svn commit: r12012 - in trunk/subversion: libsvn_client libsvn_wc tests/clients/cmdline

From: <kfogel_at_collab.net>
Date: 2004-11-24 19:22:51 CET

philip@tigris.org writes:
> --- trunk/subversion/libsvn_wc/log.c (original)
> +++ trunk/subversion/libsvn_wc/log.c Tue Nov 23 18:37:33 2004
> @@ -1480,29 +1481,45 @@
> SVN_ERR (svn_wc__adm_steal_write_lock (&adm_access, optional_adm_access,
> path, pool));
>
> - /* Recurse on versioned subdirs first, oddly enough. */
> + /* Recurse on versioned elements first, oddly enough. */
> SVN_ERR (svn_wc_entries_read (&entries, adm_access, FALSE, pool));
> -
> + subpool = svn_pool_create (pool);
> for (hi = apr_hash_first (pool, entries); hi; hi = apr_hash_next (hi))
> {
> const void *key;
> void *val;
> const svn_wc_entry_t *entry;
> + const char *entry_path;
>
> + svn_pool_clear (subpool);
> apr_hash_this (hi, &key, NULL, &val);
> entry = val;
> + entry_path = svn_path_join (path, key, subpool);
>
> - if ((entry->kind == svn_node_dir)
> - && (strcmp (key, SVN_WC_ENTRY_THIS_DIR) != 0))
> + if (entry->kind == svn_node_dir
> + && strcmp (key, SVN_WC_ENTRY_THIS_DIR) != 0)
> {
> - /* Recurse */
> - const char *subdir = svn_path_join (path, key, pool);
> - SVN_ERR (svn_io_check_path (subdir, &kind, pool));
> + /* Sub-directories */
> + SVN_ERR (svn_io_check_path (entry_path, &kind, subpool));
> if (kind == svn_node_dir)
> - SVN_ERR (svn_wc_cleanup (subdir, adm_access, diff3_cmd,
> + /* ### I'd like to pass subpool and close the batons as we go
> + ### but we probably need 2.0 for such a behaviour change */
> + SVN_ERR (svn_wc_cleanup (entry_path, adm_access, diff3_cmd,
> cancel_func, cancel_baton, pool));

What happens if we pass subpool right now? If we're recursing
depth-first, and we close batons from the bottom up, how is that a
visible behavior change?

(Not arguing, just not understanding something.)

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 24 19:25:55 2004

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