Re: svn commit: r1095914 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/merge.c libsvn_wc/deprecated.c libsvn_wc/props.c libsvn_wc/props.h libsvn_wc/update_editor.c
Update: this is caused by CONTENT_STATE in close_file() not getting a
proper value when fb->obstruction_found==1. It affects the
notification later in the function.
I'll tease out the logic tomorrow...
On Mon, May 2, 2011 at 07:32, Greg Stein <gstein_at_gmail.com> wrote:
> I have local failures on checkout_test 4 5 6 8, with this revision.
> I've narrowed it down to this particular revision, but am done for the
> night. Something about this revision is breaking on my (Mac OS)
> laptop. Given that the buildbots are all green, I would suppose it is
> some artifact of this particular OS, and that probably means some kind
> of memory lifetime issue.
> An extra review of this revision would be good; maybe somebody will
> spot something.
> On Fri, Apr 22, 2011 at 06:17, <rhuijben_at_apache.org> wrote:
>> Author: rhuijben
>> Date: Fri Apr 22 10:17:41 2011
>> New Revision: 1095914
>> URL: http://svn.apache.org/viewvc?rev=1095914&view=rev
>> Remove the direct workingqueue install from the property merge code, to allow
>> installing all the changes of an update at once.
>> * subversion/include/svn_wc.h
>> (svn_wc_merge_props3): Update documentation to reflect reality.
>> (svn_wc_merge_props2): Document the old error codes.
>> * subversion/libsvn_client/merge.c
>> (merge_props_changed): Update caller.
>> * subversion/libsvn_wc/deprecated.c
>> (svn_wc_merge_props2): Update error codes to their old documented values.
>> * subversion/libsvn_wc/props.c
>> (immediate_install_props): Remove unused function.
>> (svn_wc__perform_props_merge): Use one svn_wc__db_read_info() instead of a
>> few separate db calls. Install workqueue items and run queue only
>> if necessary.
>> (svn_wc__merge_props): Return work items instead of installing them. Create
>> skel in the result pool.
>> (svn_wc__internal_propset): Update caller.
>> * subversion/libsvn_wc/props.h
>> (svn_wc__merge_props): Rewrite comment.
>> * subversion/libsvn_wc/update_editor.c
>> (close_directory): Collect working items and store them when updating. Use
>> scratch_pool in more places.
>> (close_file): Collect working items from property merge and store them.
>> Don't overwrite the all_working_items list.
Received on 2011-05-03 10:52:47 CEST
This is an archived mail posted to the Subversion Dev