julianf...@apache.org writes: > Author: julianfoad > Date: Thu Dec 6 14:58:31 2012 > New Revision: 1417926 > > URL: http://svn.apache.org/viewvc?rev=1417926&view=rev > Log: > Remove the 'base_merge' parameter from svn_wc__merge_props(), instead > doing a 'base merge' iff the 'new_pristine_props' output parameter is given, > for simplicity.
> --- subversion/trunk/subversion/libsvn_wc/props.c (original) > +++ subversion/trunk/subversion/libsvn_wc/props.c Thu Dec 6 14:58:31 2012 > @@ -294,12 +294,13 @@ svn_wc__perform_props_merge(svn_wc_notif > /* Note that while this routine does the "real" work, it's only > prepping tempfiles and writing log commands. */ > SVN_ERR(svn_wc__merge_props(&conflict_skel, state, > - &new_pristine_props, &new_actual_props, > + base_merge ? &new_pristine_props : NULL, > + &new_actual_props, I think this change is causing this error: W: ==32246== Conditional jump or move depends on uninitialised value(s) W: ==32246== at 0x510A7F4: svn_wc__perform_props_merge (props.c:340) W: ==32246== by 0x510AA4C: svn_wc_merge_props3 (props.c:392) W: ==32246== by 0x4E73748: merge_dir_props_changed (merge.c:1445) W: ==32246== by 0x4E9B7C5: close_directory (repos_diff.c:1120) W: ==32246== by 0x559EB6D: close_directory (cancel.c:261) W: ==32246== by 0x559EB6D: close_directory (cancel.c:261) W: ==32246== by 0x688FA75: drive (reporter.c:1395) W: ==32246== by 0x688FD9F: finish_report (reporter.c:1451) W: ==32246== by 0x68901C6: svn_repos_finish_report (reporter.c:1543) W: ==32246== by 0x665FEA8: reporter_finish_report (ra_plugin.c:251) W: ==32246== by 0x4E7ACFF: drive_merge_report_editor (merge.c:5320) W: ==32246== by 0x4E81570: do_mergeinfo_aware_dir_merge (merge.c:8901) which is causing the ubuntu buildbot to fail: svn: E235000: In file 'subversion/libsvn_wc/props.c' line 341: assertion failed (new_pristine_props != NULL && new_actual_props != NULL) -- Certified & Supported Apache Subversion Downloads: http://www.wandisco.com/subversion/download
