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

[PATCH] Additional XFail test to prove issue #2897

From: Senthil Kumaran S <senthil_at_collab.net>
Date: 2007-12-26 08:17:22 CET


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.

Senthil Kumaran S

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

Received on Wed Dec 26 08:20:35 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.