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

Re: MAC OSX stack trace, please, for commit-tests.py 59

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 17 Jul 2009 15:47:31 +0100

Hyrum K. Wright wrote:
> I *think* I fixed this in r38436, but I have no way of testing
> locally, so I'll have to sit back and see if the buildbots go green.
> (Or somebody else can run the test through valgrind and see if this
> fixes the previously presented error.)

I see... Looks likely. Quoting your change...
[[[
Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 38435)
+++ subversion/libsvn_wc/entries.c (revision 38436)
@@ -2353,20 +2353,20 @@ entries_write_body(svn_wc__db_t *db,
                                       scratch_pool, scratch_pool);
   if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
     {
       /* We could be looking at a newly added node, without a BASE node,
          and hence no dav cache, so just ignore the error. */
       svn_error_clear(err);
     }
   else if (err)
     return err;
-
- apr_hash_set(dav_cache, local_abspath, APR_HASH_KEY_STRING, child_cache);
+ else
+ apr_hash_set(dav_cache, local_abspath, APR_HASH_KEY_STRING, child_cache);

   SVN_ERR(svn_wc__db_base_get_children(&children, db, local_abspath,
                                        scratch_pool, scratch_pool));

   for (i = 0; i < children->nelts; i++)
     {
]]]

The exact same construct appears a few lines further down as well,
inside the children loop, so doesn't the same change need to be made
there?

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2372083
Received on 2009-07-17 16:47:52 CEST

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