You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/07/22 22:43:48 UTC
svn commit: r966852 -
/subversion/branches/1.6.x-issue3657/subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Thu Jul 22 20:43:48 2010
New Revision: 966852
URL: http://svn.apache.org/viewvc?rev=966852&view=rev
Log:
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.
Modified:
subversion/branches/1.6.x-issue3657/subversion/tests/cmdline/merge_tests.py
Modified: subversion/branches/1.6.x-issue3657/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3657/subversion/tests/cmdline/merge_tests.py?rev=966852&r1=966851&r2=966852&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3657/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/1.6.x-issue3657/subversion/tests/cmdline/merge_tests.py Thu Jul 22 20:43:48 2010
@@ -16664,10 +16664,6 @@ def copy_causes_phantom_eol_conflict(sbo
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 @@ def copy_causes_phantom_eol_conflict(sbo
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,