Thanks Senthil.
I made the following corrections to your patch.
Sorry for the following style of comment, I have a difficulty in
responding to anyone's patches inline.
1)Extended the initial doc.
2)Doc correction.
-+ # Modify alpha in trunk at r8
++ # One more dummy change at r8.
3)You need to merge r10 from feature branch to trunk that is the crux of
this test.
4)Code correction, r11 changes won't come in first pass of merge(r2:9)
and hence the following correction is needed.
-+ new_content = new_content.replace("line8.", "FBLINE8.")
Committed with the above corrections in r28649.
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 more complex
> 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/svntest/actions.py
> (inject_conflict_into_expected_state): Tweak this function to replace a
> pattern in wc_text with conflict marker, instead of appending.
>
> * subversion/tests/cmdline/merge_tests.py
> (textual_merges_galore, merge_add_over_versioned_file_conflicts,
> merge_non_reflective_with_conflict): Adjust conflict marker
> injection to
> reflect above change.
> (merge_non_reflective_with_complex_conflict): New function.
> (test_list): Add 'merge_non_reflective_with_complex_conflict' to
> test_list
> as XFail test.
>
> Patch by: stylesen
> Suggested by: kameshj
> ]]]
>
> Thank You.
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> 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 26 16:49:57 2007