RE: svn commit: r1026128 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

[Bert Huijben <be...@qqmail.nl>]

> -----Original Message-----
> From: ehu@apache.org [mailto:ehu@apache.org]
> Sent: donderdag 21 oktober 2010 22:27
> To: commits@subversion.apache.org
> Subject: svn commit: r1026128 -
> /subversion/trunk/subversion/libsvn_wc/adm_ops.c
> 
> Author: ehu
> Date: Thu Oct 21 20:26:30 2010
> New Revision: 1026128
> 
> URL: http://svn.apache.org/viewvc?rev=1026128&view=rev
> Log:
>  * subversion/libsvn_wc/adm_ops.c
>    (revert_internal): More safety checks after last week's cleanup.
> 
> Modified:
>     subversion/trunk/subversion/libsvn_wc/adm_ops.c
> 
> Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_
> ops.c?rev=1026128&r1=1026127&r2=1026128&view=diff
> =======================================================================
> =======
> --- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu Oct 21 20:26:30
> 2010

<snip>

> @@ -1612,10 +1618,12 @@ revert_internal(svn_wc__db_t *db,
>        svn_pool_destroy(iterpool);
>      }
> 
> -  if (! replaced && status == svn_wc__db_status_added
> +  if (reverted
> +      && ! replaced
> +      && status == svn_wc__db_status_added
>        && db_kind == svn_wc__db_kind_dir)
>      {
> -      /* Non-replacements have their admin area deleted. wc-1.0 */
> +      /* Non-replaced directories have their admin area deleted. wc-
> 1.0 */
>        SVN_ERR(svn_wc__adm_destroy(db, local_abspath,
>                                    cancel_func, cancel_baton, pool));
>      }
> 

I don't think we need this block with single-db. There is no administrative area to remove.

	Bert

Re: svn commit: r1026128 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

[Erik Huelsmann <eh...@gmail.com>]

>> -  if (! replaced && status == svn_wc__db_status_added
>> +  if (reverted
>> +      && ! replaced
>> +      && status == svn_wc__db_status_added
>>        && db_kind == svn_wc__db_kind_dir)
>>      {
>> -      /* Non-replacements have their admin area deleted. wc-1.0 */
>> +      /* Non-replaced directories have their admin area deleted. wc-
>> 1.0 */
>>        SVN_ERR(svn_wc__adm_destroy(db, local_abspath,
>>                                    cancel_func, cancel_baton, pool));
>>      }
>>
>
> I don't think we need this block with single-db. There is no administrative area to remove.

This call also destroys the adm-access which may be cached in the
db-handle. Removing that call makes one of our 'we should work with
our old entries code' tests fail. Maybe the comment should state
something to that effect?


Bye,

Erik.