You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/08/11 14:41:17 UTC
Re: svn commit: r38671 - trunk/subversion/libsvn_wc
On Tue, Aug 11, 2009 at 16:24, Hyrum K. Wright<hy...@hyrumwright.org> wrote:
>...
> +++ trunk/subversion/libsvn_wc/status.c Tue Aug 11 07:24:26 2009 (r38671)
>...
> @@ -1712,9 +1715,8 @@ delete_entry(const char *path,
> /* Read the parent's entries file. If the deleted thing is not
> versioned in this working copy, it was probably deleted via this
> working copy. No need to report such a thing. */
> - /* ### use svn_wc_entry() instead? */
> - SVN_ERR(svn_wc__entry_versioned(&entry, full_path, eb->adm_access,
> - FALSE, pool));
> + SVN_ERR(svn_wc__get_entry(&entry, eb->db, local_abspath, TRUE,
> + svn_node_unknown, FALSE, pool, pool));
> if (entry->kind == svn_node_dir)
> {
allow_unversioned should be FALSE. entry_versioned always requires
that the requested node be present. Also note that returning
entry==NULL would be bad here, given the immediate dereference.
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2382502
Re: svn commit: r38671 - trunk/subversion/libsvn_wc
Posted by "Hyrum K. Wright" <hy...@hyrumwright.org>.
On Aug 11, 2009, at 9:41 AM, Greg Stein wrote:
> On Tue, Aug 11, 2009 at 16:24, Hyrum K.
> Wright<hy...@hyrumwright.org> wrote:
>> ...
>> +++ trunk/subversion/libsvn_wc/status.c Tue Aug 11 07:24:26
>> 2009 (r38671)
>> ...
>> @@ -1712,9 +1715,8 @@ delete_entry(const char *path,
>> /* Read the parent's entries file. If the deleted thing is not
>> versioned in this working copy, it was probably deleted via this
>> working copy. No need to report such a thing. */
>> - /* ### use svn_wc_entry() instead? */
>> - SVN_ERR(svn_wc__entry_versioned(&entry, full_path, eb->adm_access,
>> - FALSE, pool));
>> + SVN_ERR(svn_wc__get_entry(&entry, eb->db, local_abspath, TRUE,
>> + svn_node_unknown, FALSE, pool, pool));
>> if (entry->kind == svn_node_dir)
>> {
>
> allow_unversioned should be FALSE. entry_versioned always requires
> that the requested node be present. Also note that returning
> entry==NULL would be bad here, given the immediate dereference.
r38675.
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2382557