> Log:
> Fix issue #4169 'added subtrees with non-inheritable mergeinfo cause
> spurious subtree mergeinfo'.
>
> This fixes a bug julianf noted in r1205867.
>
> * subversion/libsvn_client/merge.c
>
> (notification_receiver_baton_t): Clarify what is and isn't stored in the
> added_abspaths member.
Hi Paul. No such change appears in the commit. Maybe just a log msg error?
> (notification_receiver): Only stash the roots of added subtrees rather
> than tracking every added subtree excepting the immediate children of
> added roots (which is what happened previously). There is no need to
> track those other added subtrees (and as the test below demonstrates,
> there are edge cases where spurious subtree mergeinfo can be created).
>
> * subversion/tests/cmdline/merge_tests.py
>
> (merge_with_added_subtrees_with_mergeinfo): New.
>
> (test_list): Add merge_with_added_subtrees_with_mergeinfo.
[...]
> Modified: subversion/trunk/subversion/libsvn_client/merge.c
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/merge.c (original)
> +++ subversion/trunk/subversion/libsvn_client/merge.c Wed Apr 25 17:57:30 2012
> @@ -2941,30 +2941,47 @@ notification_receiver(void *baton, const
>
> if (notify->action == svn_wc_notify_update_add)
> {
> - svn_boolean_t is_root_of_added_subtree = FALSE;
[...]
- Julian
Received on 2012-04-26 14:12:16 CEST