Re: svn commit: r29085 - in trunk/subversion: libsvn_client tests/cmdline

[Paul Burba <pt...@gmail.com>]

In IRC today:

<CIA-21> pburba * r29085 /trunk/subversion/ (libsvn_client/merge.c
tests/cmdline/merge_tests.py): Stop merge from adding mergeinfo from a
target's own history. ...
<cmpilato> pburba: could you not have made use of the
locations-as-mergeinfo helper function?
<cmpilato> (that's not the actual name of the function, but...)
<cmpilato> svn_client__get_history_as_mergeinfo()
<pburba> cmpilato: Oh, maybe I could have, let me look

Hi Mike,

I'm struggling to see how to use
svn_client__get_history_as_mergeinfo() within the context of
libsvn_client/merge.c:merge_props_changed() to filter mergeinfo added
to a target from that target's own history.

Did you see something that would greatly simplify the implementation
of filter_self_referential_mergeinfo()?  If so, could you give me a
bit of what you were thinking?

Thanks,

Paul

On Jan 30, 2008 2:34 PM,  <pb...@tigris.org> wrote:
> Author: pburba
> Date: Wed Jan 30 11:34:41 2008
> New Revision: 29085
>
> Log:
> Stop merge from adding mergeinfo from a target's own history.
>
> As discussed here,
> http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=134491, the
> new merge test 'dont_add_mergeinfo_from_own_history' added in this commit
> fails on Win32 over ra_svn.  But since that appears to be an existing problem
> (uncovered by this new test) I'm committing this and looking into a separate
> fix.
>
> * subversion/libsvn_client/merge.c
>   (mergeinfo_behavior): Move ahead of first call.
>   (filter_self_referential_mergeinfo): New.
>   (merge_props_changed): Call filter_self_referential_mergeinfo() before
>   merging incoming prop changes with original props.
>
> * subversion/tests/cmdline/merge_tests.py
>   (dont_add_mergeinfo_from_own_history): New.
>   (test_list): Add dont_add_mergeinfo_from_own_history.
>
> Modified:
>    trunk/subversion/libsvn_client/merge.c
>    trunk/subversion/tests/cmdline/merge_tests.py

<snip>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org