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

Re: svn commit: r953622 - in /subversion/trunk/subversion/libsvn_wc: entries.h log.c log.h old-and-busted.c

From: Greg Stein <gstein_at_gmail.com>
Date: Fri, 11 Jun 2010 05:39:36 -0400

On Fri, Jun 11, 2010 at 05:32, <rhuijben_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/log.c Fri Jun 11 09:32:06 2010
>...

> -  /* ### this code has a limited set of modifications. enforce it.  */
> -  SVN_ERR_ASSERT((modify_flags & ~(0
> -                    /* from props.c  */
> -                    | SVN_WC__ENTRY_MODIFY_PREJFILE
> -
> -                    /* from merge.c  */
> -                    | SVN_WC__ENTRY_MODIFY_CONFLICT_OLD
> -                    | SVN_WC__ENTRY_MODIFY_CONFLICT_NEW
> -                    | SVN_WC__ENTRY_MODIFY_CONFLICT_WRK)) == 0);

Can these defines be removed from entries.h ?

>...
> +++ subversion/trunk/subversion/libsvn_wc/old-and-busted.c Fri Jun 11 09:32:06 2010
>...
> @@ -778,12 +778,17 @@ extract_string_normalize(int *modify_fla
>    ### for that particular field. MODIFY_FLAGS is *only* used by the
>    ### log-based entry modification system, and will go way once we
>    ### completely move away from loggy.
> -*/
> -svn_error_t *
> -svn_wc__atts_to_entry(svn_wc_entry_t **new_entry,
> -                      int *modify_flags,
> -                      apr_hash_t *atts,
> -                      apr_pool_t *pool)
> +
> +   Set *NEW_ENTRY to a new entry, taking attributes from ATTS, whose
> +   keys and values are both char *.  Allocate the entry and copy
> +   attributes into POOL as needed.
> +
> +   Set MODIFY_FLAGS to reflect the fields that were present in ATTS. */
> +static svn_error_t *
> +atts_to_entry(svn_wc_entry_t **new_entry,
> +              int *modify_flags,
> +              apr_hash_t *atts,
> +              apr_pool_t *pool)

handle_start_tag() does not require MODIFY_FLAGS.

>...

Cheers,
-g
Received on 2010-06-11 11:40:15 CEST

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