Attached is a patch implmenting mergeinfo elision during svn merge,
update, and switch operations. It passes the 6-way and JavaHL tests on
Win32 and I think it's ready for prime time, but if anyone has some time
to take a look I'd appreciate it.
Implement svn:mergeinfo elision for svn merge, update, and switch.
(svn_client__elide_mergeinfo): New. Elides mergeinfo on a target WC
to it's nearest ancestor with equivalent mergeinfo.
(get_wc_merge_info): Add arguments to restrict how far up the WC to
for inherited mergeinfo and whether to look *only* for inherited
Add reference argument to record the path walked to find inherited
(get_wc_or_repos_merge_info): Update call to get_wc_merge_info().
(mergeinfo_elides): New. A wrapper around svn_mergeinfo_diff() that
understands mergeinfo equivalence rather than absolute equality.
(elide_children): New. Iterate through array of target path's children
with mergeinfo and elide only the path's immediate children.
* subversion/libsvn_client/switch.c (svn_client__switch_internal):
* subversion/libsvn_client/update.c (svn_client__update_internal):
Upon completion of switch/update perform post-order traversal of
children with mergeinfo, checking each for elidability and finally
the target itself if applicable.
status and properties to account for svn:mergeinfo elision.
(test_list): Remove XFail from mergeinfo_elision test.
(test_list): Remove XFail from mergeinfo_switch_elision test.
(test_list): Remove XFail from mergeinfo_update_elision test.
Received on Sat Apr 14 18:17:08 2007
To unsubscribe, e-mail: email@example.com
For additional commands, e-mail: firstname.lastname@example.org