Re: Another segfault in the wc prop merge code...

John Szakmeister <john@szakmeister.net> writes:

> I'm not sure what the correct behavior should be. Looking at
> svn_wc_merge_props() it's unclear whether baseprops is allowed to be NULL
> (baseprops eventually makes it's way down as server_baseprops in
> svn_wc__merge_props()). So I decided to toss this to the list to see what
> the WC experts think of the situation.

This makes directory adds behave like file adds:

Index: subversion/libsvn_client/repos_diff.c
===================================================================
--- subversion/libsvn_client/repos_diff.c (revision 15873)
+++ subversion/libsvn_client/repos_diff.c (working copy)
@@ -588,6 +588,7 @@
   /* ### TODO: support copyfrom? */
 
   b = make_dir_baton (path, pb, pb->edit_baton, TRUE, pool);
+ b->pristine_props = pb->edit_baton->empty_hash;
   *child_baton = b;
 
   SVN_ERR (get_path_access (&adm_access,

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org