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

Re: svn commit: r39733 - in trunk/subversion: include/private libsvn_client libsvn_wc tests/cmdline

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Thu, 1 Oct 2009 14:40:39 +0100

On Thu, 2009-10-01 at 05:44 -0700, Bert Huijben wrote:
> Author: rhuijben
> Date: Thu Oct 1 05:44:40 2009
> New Revision: 39733
>
> Log:
> Following up on r39729, fix the 'tree conflicts: tree missing, leaf del'
> test by adding a temporary api for checking on working copy obstructions.
>
> Note that this class of obstructions will be gone once we move to a
> central db.

Why/how won't it be possible for a node to be obstructed?

> Modified: trunk/subversion/libsvn_client/merge.c
>
> + /* svn_wc__maybe_get_entry ignores node kind errors, so check if we
> + didn't get the parent stub */
> + if (entry && entry->kind == svn_node_dir && *entry->name != '\0')
> + return svn_wc_notify_state_missing; /* Only found parent entry */
> +
> + err = svn_wc__temp_node_obstructed(&obstructed, merge_b->ctx->wc_ctx,
> + local_abspath, pool);
> +
> + if (err)
> + svn_error_clear(err);

Why is it OK to ignore an error?

> + else if (obstructed)
> + return svn_wc_notify_state_obstructed;
> +
> kind_expected = node_kind_working(path, merge_b, entry);
> kind_on_disk = node_kind_on_disk(path, merge_b, pool);
>

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2402520
Received on 2009-10-01 15:41:01 CEST

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