> -----Original Message-----
> From: rhuij...@apache.org [mailto:rhuij...@apache.org]
> Sent: zaterdag 26 januari 2013 00:55
> To: comm...@subversion.apache.org
> Subject: svn commit: r1438778 -
> /subversion/trunk/subversion/libsvn_client/merge.c
>
> Author: rhuijben
> Date: Fri Jan 25 23:54:39 2013
> New Revision: 1438778
>
> URL: http://svn.apache.org/viewvc?rev=1438778&view=rev
> Log:
> * subversion/libsvn_client/merge.c
> (merge_dir_props_changed): Add note about merge_tests.py failure.
>
> Modified:
> subversion/trunk/subversion/libsvn_client/merge.c
>
> Modified: subversion/trunk/subversion/libsvn_client/merge.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/m
> erge.c?rev=1438778&r1=1438777&r2=1438778&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_client/merge.c (original)
> +++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jan 25 23:54:39
> 2013
> @@ -1514,6 +1514,18 @@ merge_dir_props_changed(svn_wc_notify_st
> ### merges, but in this case the fix added here should also be
> applied
> ### for added files! */
>
> + /* ### The old code performed (via prepare_merge_props_changed):
> + if (apr_hash_get(new_pristine_props, SVN_PROP_MERGEINFO,
> + APR_HASH_KEY_STRING))
> + {
> + alloc_and_store_path(&merge_b->paths_with_new_mergeinfo,
> + local_abspath, merge_b->pool);
> + }
> + ### which is something merge_add_file() doesn't do, but
> + ### merge_tests.py 95: no self referential filtering on added path
> + ### fails if this block is not enabled.
> + */
If I enable this here, and in the merge_add_file() function all tests will pass
with only slight 'U' vs 'G' tweaks, but I'm not sure if this is really the
behavior we want here.
I expect that we really want different behavior on changed directories vs added
directories. I don't see why we want to describe the whole merge on a node if
the merge just added the final version.
Bert
