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/06/16 19:41:10 UTC
svn commit: r955320 -
/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
Author: pburba
Date: Wed Jun 16 17:41:10 2010
New Revision: 955320
URL: http://svn.apache.org/viewvc?rev=955320&view=rev
Log:
Follow-up to r953878: Fix test for issue #3654 so it runs (and XFails)
correctly on trunk.
* subversion/tests/cmdline/merge_reintegrate_tests.py
(added_subtrees_with_mergeinfo_break_reintegrate): Supply missing arguments
to svntest.actions.run_and_verify_merge. I originally wrote this
XFailing test on a 1.6.x WC, but it needs the aforementioned tweaks
to run (and fail) on trunk.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=955320&r1=955319&r2=955320&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Wed Jun 16 17:41:10 2010
@@ -1994,6 +1994,12 @@ def added_subtrees_with_mergeinfo_break_
'B/lambda' : Item(status='U '),
'C/nu' : Item(status=' U'),
})
+ expected_mergeinfo_output = wc.State(A_path, {
+ '' : Item(status=' G'),
+ 'C/nu' : Item(status=' G'),
+ })
+ expected_elision_output = wc.State(A_path, {
+ })
expected_status = wc.State(A_path, {
'' : Item(status=' M'),
'B' : Item(status=' '),
@@ -2055,8 +2061,10 @@ def added_subtrees_with_mergeinfo_break_
})
expected_skip = wc.State(A_COPY_path, {})
svntest.actions.run_and_verify_merge(A_path, None, None,
- sbox.repo_url + '/A_COPY',
+ sbox.repo_url + '/A_COPY', None,
expected_output,
+ expected_mergeinfo_output,
+ expected_elision_output,
expected_disk,
expected_status,
expected_skip,