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

Re: svn commit: r39588 - trunk/subversion/libsvn_wc

From: Greg Stein <gstein_at_gmail.com>
Date: Fri, 25 Sep 2009 05:34:02 -0400

This makes copy_tests 24 fail. It is one of those mystical and
mysterious failure involving the entries cache.

Looking at it now, but it is getting late here...

On Fri, Sep 25, 2009 at 02:49, Greg Stein <gstein_at_gmail.com> wrote:
> Author: gstein
> Date: Thu Sep 24 23:49:19 2009
> New Revision: 39588
>
> Log:
> Delete a changelist from a node using the wc_db API rather than the old
> entry_modify2() function.
>
> * subversion/libsvn_wc/log.c:
>  (log_do_delete_changelist): switch to svn_wc__db_op_set_changelist()
>
> * subversion/libsvn_wc/entries.h:
>  (SVN_WC__ENTRY_MODIFY_CHANGELIST): removed. obsolete.
>
> * subversion/libsvn_wc/entries.c:
>  (fold_entry): remove section that modifies the changelist
>
> Modified:
>   trunk/subversion/libsvn_wc/entries.c
>   trunk/subversion/libsvn_wc/entries.h
>   trunk/subversion/libsvn_wc/log.c
>
> Modified: trunk/subversion/libsvn_wc/entries.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/entries.c?pathrev=39588&r1=39587&r2=39588
> ==============================================================================
> --- trunk/subversion/libsvn_wc/entries.c        Thu Sep 24 23:37:05 2009        (r39587)
> +++ trunk/subversion/libsvn_wc/entries.c        Thu Sep 24 23:49:19 2009        (r39588)
> @@ -2530,11 +2530,7 @@ fold_entry(apr_hash_t *entries,
>
>   /* LOCK flags are no longer passed to entry_modify().  */
>
> -  /* Changelist */
> -  if (modify_flags & SVN_WC__ENTRY_MODIFY_CHANGELIST)
> -    cur_entry->changelist = (entry->changelist
> -                             ? apr_pstrdup(pool, entry->changelist)
> -                             : NULL);
> +  /* changelist is no longer modified with this function.  */
>
>   /* has-props, prop-mods, cachable-props, and present-props are deprecated,
>      so we do not copy them. */
>
> Modified: trunk/subversion/libsvn_wc/entries.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/entries.h?pathrev=39588&r1=39587&r2=39588
> ==============================================================================
> --- trunk/subversion/libsvn_wc/entries.h        Thu Sep 24 23:37:05 2009        (r39587)
> +++ trunk/subversion/libsvn_wc/entries.h        Thu Sep 24 23:49:19 2009        (r39588)
> @@ -134,7 +134,6 @@ svn_error_t *svn_wc__atts_to_entry(svn_w
>  #define SVN_WC__ENTRY_MODIFY_INCOMPLETE         APR_INT64_C(0x0000000000100000)
>  #define SVN_WC__ENTRY_MODIFY_ABSENT             APR_INT64_C(0x0000000000200000)
>  /* OPEN */
> -#define SVN_WC__ENTRY_MODIFY_CHANGELIST         APR_INT64_C(0x0000000040000000)
>  #define SVN_WC__ENTRY_MODIFY_KEEP_LOCAL         APR_INT64_C(0x0000000080000000)
>  #define SVN_WC__ENTRY_MODIFY_WORKING_SIZE       APR_INT64_C(0x0000000100000000)
>  /* OPEN */
>
> Modified: trunk/subversion/libsvn_wc/log.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/log.c?pathrev=39588&r1=39587&r2=39588
> ==============================================================================
> --- trunk/subversion/libsvn_wc/log.c    Thu Sep 24 23:37:05 2009        (r39587)
> +++ trunk/subversion/libsvn_wc/log.c    Thu Sep 24 23:49:19 2009        (r39588)
> @@ -740,17 +740,12 @@ log_do_delete_changelist(struct log_runn
>                          const char *name)
>  {
>   svn_error_t *err;
> -  svn_wc_entry_t entry;
>
> -  entry.changelist = NULL;
> -
> -  /* Now write the new entry out */
> -  err = svn_wc__entry_modify2(loggy->db,
> -                              svn_dirent_join(loggy->adm_abspath, name,
> -                                              loggy->pool),
> -                              svn_node_unknown, FALSE,
> -                              &entry, SVN_WC__ENTRY_MODIFY_CHANGELIST,
> -                              loggy->pool);
> +  err = svn_wc__db_op_set_changelist(loggy->db,
> +                                     svn_dirent_join(loggy->adm_abspath, name,
> +                                                     loggy->pool),
> +                                     NULL,
> +                                     loggy->pool);
>   if (err)
>     return svn_error_createf(pick_error_code(loggy), err,
>                              _("Error removing changelist from entry '%s'"),
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2400102
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2400154
Received on 2009-09-25 11:34:18 CEST

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