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

RE: svn commit: r936163 - in /subversion/trunk/subversion/libsvn_wc: entries.c wc_db.c

From: Bert Huijben <bert_at_qqmail.nl>
Date: Wed, 21 Apr 2010 12:12:13 +0200

> -----Original Message-----
> From: gstein_at_apache.org [mailto:gstein_at_apache.org]
> Sent: woensdag 21 april 2010 8:03
> To: commits_at_subversion.apache.org
> Subject: svn commit: r936163 - in /subversion/trunk/subversion/libsvn_wc:
> entries.c wc_db.c
>
> Author: gstein
> Date: Wed Apr 21 06:02:56 2010
> New Revision: 936163

> Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_
> db.c?rev=936163&r1=936162&r2=936163&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Apr 21 06:02:56
> 2010
> @@ -5631,7 +5631,27 @@ svn_wc__db_scan_deletion(const char **ba
>
> /* Only "normal" and "not-present" are allowed. */
> SVN_ERR_ASSERT(base_presence == svn_wc__db_status_normal
> - || base_presence == svn_wc__db_status_not_present);
> + || base_presence == svn_wc__db_status_not_present
> +#if 1
> + /* ### there are cases where the BASE node is
> + ### marked as incomplete. we should treat this
> + ### as a "normal" node for the purposes of
> + ### this function. we really should not allow
> + ### it, but this situation occurs within the
> + ### following tests:
> + ### switch_tests 31
> + ### update_tests 46
> + ### update_tests 53
> + */
> + || base_presence == svn_wc__db_status_incomplete
> +#endif
> + );

This syntax is non-standard and breaks compilation in Visual C (and probably other C preprocessors).

        Bert
Received on 2010-04-21 12:12:51 CEST

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