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

Re: [PATCH] Additional XFail test to prove issue #2897

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-12-19 15:29:12 CET

Thanks Senthil,

Tweaked a lot and committed in r28555.

Details of tweak,
Made r4 to be a change in line3 /feature_branch/alpha rather than line5.
Made r6 to be a change in feature branch as against the trunk, this
change is line5 change.
Fixed few of the copy-paste expectations from earlier testcase.
In one of the conflicting merges you are not checking the
'svn:mergeinfo' which should have merge range till the successful merge
range.
Made the last feature branch->trunk in two stages as the first one would
always give a conflict.

Points to cleanup,
In this patch we keep creating different expected_status from
'get_virginal_state', we need to reuse them, probably in other 2
testcases too.
We need to extend this conflict scenario to have conflict resolution to
be changing few other lines like modifying 'line1' along with addressing
exactly one line of conflict.

Thanks
With regards
Kamesh Jayachandran

Senthil Kumaran S wrote:
> Hi,
>
> I am attaching a patch along with this email which adds a new XFail
> test case
> (issue 2897 branch) for non-reflective merge along with conflicts.
>
> [[[
> On the issue-2897 branch:
>
> Additional XFail test to prove issue #2897
>
> See http://subversion.tigris.org/issues/show_bug.cgi?id=2897
>
> * subversion/tests/cmdline/merge_tests.py
> (merge_non_reflective_with_conflict): New function.
> (test_list): Add 'merge_non_reflective_with_conflict' to test_list
> as XFail test.
>
> Patch by: stylesen
> Suggested by: kameshj
> ]]]
>
> Thank You.
>
> --
> Senthil Kumaran S
> http://www.stylesen.org/
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Dec 19 15:28:38 2007

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