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

2011-11-23 Thread Julian Foad
Philip Martin wrote: > The simple patch: > [...] > +  else if (state) > +    *state = svn_wc_notify_state_unchanged; [...] > > does fix the valgrind warning. Thanks Philip. - Julian

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

2011-11-23 Thread Philip Martin
Philip Martin 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 sett

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

2011-11-23 Thread Philip Martin
Philip Martin writes: > julianf...@apache.org writes: > >> Author: julianfoad >> Date: Mon Nov 21 13:38:13 2011 >> New Revision: 1204489 >> >> URL: http://svn.apache.org/viewvc?rev=1204489&view=rev >> Log: >> Move more variables to a smaller scope and fix uninitialized output >> parameters in cal

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

2011-11-23 Thread Philip Martin
julianf...@apache.org writes: > Author: julianfoad > Date: Mon Nov 21 13:38:13 2011 > New Revision: 1204489 > > URL: http://svn.apache.org/viewvc?rev=1204489&view=rev > Log: > Move more variables to a smaller scope and fix uninitialized output > parameters in callback functions. The variables prev