[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1330444 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 26 Apr 2012 13:11:40 +0100 (BST)

> 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

This is an archived mail posted to the Subversion Dev mailing list.