Re: svn commit: r1204489 - /subversion/trunk/subversion/libsvn_client/merge.c

Philip Martin <philip.martin_at_wandisco.com> writes:

>> Do we solve this by initialising prop_state? To what value? Or do we
>> make merge_props_changed set it when props->nels is zero? To what value?
>
> Also, looking at merge_file_changed: after the call to
> merge_props_changed a tree conflict causes a return without setting text
> state. This code has so many branches it's hard to determine that all
> paths set these values. Perhaps initialising them early is better?

The simple patch:

Index: subversion/libsvn_client/merge.c
===================================================================
--- subversion/libsvn_client/merge.c (revision 1205355)
+++ subversion/libsvn_client/merge.c (working copy)
@@ -1254,6 +1254,8 @@ merge_props_changed(svn_wc_notify_state_t *state,
       else if (err)
         return svn_error_trace(err);
     }
+ else if (state)
+ *state = svn_wc_notify_state_unchanged;
 
   return SVN_NO_ERROR;
 }

does fix the valgrind warning.

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com