Is the 'duplicate notifications" issue an issue in (ra_)serf?
Or is it related to the merge code?
Lieven
On Mon, Sep 28, 2009 at 2:57 PM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> Author: julianfoad
> Date: Mon Sep 28 07:57:01 2009
> New Revision: 39649
>
> Log:
> * subversion/tests/cmdline/merge_tests.py
> (test_list): Change test 132 from Skip(if ra-serf) to XFail(ra-serf) as it
> is not inapplicable, it is meant to work. At least we'll see the output.
>
> Modified:
> trunk/subversion/tests/cmdline/merge_tests.py
>
> Modified: trunk/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/merge_tests.py?pathrev=39649&r1=39648&r2=39649
> ==============================================================================
> --- trunk/subversion/tests/cmdline/merge_tests.py Mon Sep 28 07:32:53 2009 (r39648)
> +++ trunk/subversion/tests/cmdline/merge_tests.py Mon Sep 28 07:57:01 2009 (r39649)
> @@ -16597,8 +16597,8 @@ test_list = [ None,
> SkipUnless(multiple_reintegrates_from_the_same_branch,
> server_has_mergeinfo),
> # ra_serf causes duplicate notifications with this test:
> - Skip(merge_replace_causes_tree_conflict,
> - svntest.main.is_ra_type_dav_serf),
> + XFail(merge_replace_causes_tree_conflict,
> + svntest.main.is_ra_type_dav_serf),
> SkipUnless(handle_gaps_in_implicit_mergeinfo,
> server_has_mergeinfo),
> copy_then_replace_via_merge,
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2401261
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2401313
Received on 2009-09-28 18:47:27 CEST