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

Re: svn commit: r33207 - branches/file-externals/subversion/libsvn_client

From: Greg Stein <gstein_at_gmail.com>
Date: Fri, 19 Sep 2008 23:06:39 -0700

On Fri, Sep 19, 2008 at 10:33 PM, <blair_at_tigris.org> wrote:
>...
> +++ branches/file-externals/subversion/libsvn_client/externals.c Fri Sep 19 22:33:04 2008 (r33207)
> @@ -347,9 +347,8 @@ switch_file_external(const char *path,
> conflict on the directory. To prevent resolving a conflict
> due to another change on the directory, do not allow a file
> external to be added when one exists. */
> - SVN_ERR(svn_wc_entry(&anchor_dir_entry, anchor, adm_access, FALSE,
> - subpool));
> - SVN_ERR_ASSERT(anchor_dir_entry);
> + SVN_ERR(svn_wc__entry_versioned(&anchor_dir_entry, anchor, adm_access,
> + FALSE, subpool));
> SVN_ERR(svn_wc_conflicted_p2(&text_conflicted, &prop_conflicted,
> &has_tree_conflicted_children,
> anchor, anchor_dir_entry, subpool));

Wait a sec here... the client library can't use internal WC functions.

Cheers,
-g

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-20 08:06:53 CEST

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