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

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

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 30 Jun 2010 13:46:05 -0400

On Tue, Jun 29, 2010 at 08:59, <rhuijben_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Jun 29 12:59:30 2010
> @@ -1625,6 +1625,48 @@ svn_wc__db_base_add_absent_node(svn_wc__
>                                        scratch_pool));
>
>   flush_entries(pdh);
> +
> +  if (*local_abspath == '\0')
> +    {
> +      svn_error_t *err;
> +
> +      SVN_ERR(navigate_to_parent(&pdh, db, pdh, svn_sqlite__mode_readwrite,
> +                                 scratch_pool));
> +      VERIFY_USABLE_PDH(pdh);
> +
> +      SVN_ERR(create_repos_id(&repos_id, repos_root_url, repos_uuid,
> +                          pdh->wcroot->sdb, scratch_pool));
> +
> +      blank_ibb(&ibb);
> +
> +      ibb.status = status;
> +      ibb.kind = svn_wc__db_kind_subdir;
> +      ibb.wc_id = pdh->wcroot->wc_id;
> +      ibb.local_relpath = svn_dirent_basename(local_abspath, scratch_pool);
> +      ibb.repos_id = repos_id;
> +      ibb.repos_relpath = repos_relpath;
> +      ibb.revision = revision;
> +
> +      /* Depending upon KIND, any of these might get used. */

KIND is SUBDIR, so you don't need to worry about setting these.
Especially given the defaults from blank_ibb().

> +      ibb.children = NULL;
> +      ibb.depth = svn_depth_unknown;
> +      ibb.checksum = NULL;
> +      ibb.translated_size = SVN_INVALID_FILESIZE;
> +      ibb.target = NULL;
> +
> +      ibb.conflict = conflict;
> +      ibb.work_items = work_items;

I seriously doubt you want to put the conflict and work_items into BOTH SDBs.

>...

Cheers,
-g
Received on 2010-06-30 19:47:46 CEST

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