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

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

From: Bert Huijben <bert_at_qqmail.nl>
Date: Fri, 22 Oct 2010 09:30:44 +0200

> -----Original Message-----
> From: ehu_at_apache.org [mailto:ehu_at_apache.org]
> Sent: donderdag 21 oktober 2010 22:27
> To: commits_at_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
Received on 2010-10-22 09:31:27 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.