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

Re: svn commit: r27384 - in trunk/subversion: libsvn_wc tests/cmdline

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-10-26 02:47:18 CEST

glasser@tigris.org writes:
> --- trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ trunk/subversion/libsvn_wc/update_editor.c Thu Oct 25 12:18:01 2007
> @@ -841,36 +841,20 @@
> if (pb->edit_baton->requested_depth == svn_depth_unknown
> && pb->ambient_depth == svn_depth_empty)
> {
> + const svn_wc_entry_t *entry;
> +
> /* This is not a depth upgrade, and the parent directory is
> depth==empty. So if the parent doesn't already have an entry
> for the file, then the parent doesn't want to hear about the
> file at all, thus we should initialize it at svn_depth_exclude. */
> - svn_error_t *err;
> - const svn_wc_entry_t *entry;
> - svn_wc_adm_access_t *adm_access;
> -
> - err = svn_wc_adm_retrieve(&adm_access, pb->edit_baton->adm_access,
> - f->path, pool);
> - if (err &&
> - (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND
> - || err->apr_err == SVN_ERR_WC_NOT_LOCKED))
> - {
> - svn_error_clear(err);
> - f->ambiently_excluded = TRUE;
> - *f_p = f;
> - return SVN_NO_ERROR;
> - }
> -
> - err = svn_wc_entry(&entry, f->path, adm_access, FALSE, pool);
> - if (err && err->apr_err == SVN_ERR_ENTRY_NOT_FOUND)
> + SVN_ERR(svn_wc_entry(&entry, f->path, pb->edit_baton->adm_access,
> + FALSE, pool));
> + if (! entry)
> {
> - svn_error_clear(err);
> f->ambiently_excluded = TRUE;
> *f_p = f;
> return SVN_NO_ERROR;
> }
> - else if (err)
> - return err;
> }
>
> /* Figure out the new_URL for this file. */

AAAAAAAhhhhhh.

*much better*. Thanks, David. I learned a little bit about how to
work with svn_wc_entry_t just now.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 26 02:47:28 2007

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