On the 1.6.x-issue3657 backport branch fix new test to work on 1.6.x.
* subversion/tests/cmdline/merge_tests.py
(copy_causes_phantom_eol_conflict): Tweak call to run_and_verify_merge
so it works with 1.6.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3657@966852 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/tests/cmdline/merge_tests.py b/subversion/tests/cmdline/merge_tests.py
index 8a644b4..3337d80 100755
--- a/subversion/tests/cmdline/merge_tests.py
+++ b/subversion/tests/cmdline/merge_tests.py
@@ -16664,10 +16664,6 @@
expected_output = wc.State(A_branch_path, {
'mu' : Item(status='UU'),
})
- expected_mergeinfo_output = wc.State(A_branch_path, {
- '' : Item(status=' U'),
- })
- expected_elision_output = wc.State(A_branch_path, {})
expected_status = wc.State(A_branch_path, {
'' : Item(status=' M'),
'B' : Item(status=' '),
@@ -16717,10 +16713,7 @@
expected_skip = wc.State(A_branch_path, {})
svntest.actions.run_and_verify_merge(A_branch_path, 3, 4,
sbox.repo_url + '/A',
- None,
expected_output,
- expected_mergeinfo_output,
- expected_elision_output,
expected_disk,
expected_status,
expected_skip,
