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

Re: svn commit: r943574 - in /subversion/trunk/subversion/libsvn_wc: update_editor.c wc_db.c wc_db.h

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Thu, 13 May 2010 16:18:05 +0100

On Wed, 2010-05-12, Greg Stein wrote:
> On Wed, May 12, 2010 at 12:41, <julianfoad_at_apache.org> wrote:
> >...
> > +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed May 12 16:41:18 2010
> > @@ -3767,6 +3767,49 @@ svn_wc__db_temp_op_remove_entry(svn_wc__
> > }
> >
> >
> > +svn_error_t *
> > +svn_wc__db_temp_op_remove_working(svn_wc__db_t *db,
> > + const char *local_abspath,
> > + apr_pool_t *scratch_pool)
> > +{
> > + svn_wc__db_pdh_t *pdh;
> > + svn_sqlite__stmt_t *stmt;
> > + svn_sqlite__db_t *sdb;
> > + apr_int64_t wc_id;
> > + const char *local_relpath;
> > +
> > + SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
> > +
> > + SVN_ERR(parse_local_abspath(&pdh, &local_relpath, db, local_abspath,
> > + svn_sqlite__mode_readwrite,
> > + scratch_pool, scratch_pool));
> > + VERIFY_USABLE_PDH(pdh);
> > +
> > + flush_entries(pdh);
> > +
> > + /* Check if we should remove it from the parent db instead */
>
> Instead? It should be removing it from both places.

Oops, I was blind-copying from svn_wc__db_temp_op_remove_entry().
r943908.

- Julian

> >...
> > + sdb = pdh->wcroot->sdb;
> > + wc_id = pdh->wcroot->wc_id;
>
> Precedent is to just spell it out in the usage, rather than have local
> variables for this.
>
> >...
>
> Cheers,
> -g
Received on 2010-05-13 17:18:39 CEST

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