Author: rhuijben
Date: Tue Apr 26 23:46:43 2011
New Revision: 1096967
URL: http://svn.apache.org/viewvc?rev=1096967&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(avoid_reflected_revs): Add two --allow-mixed-revisions arguments to allow
this XFail test to go on a bit further.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1096967&r1=1096966&r2=1096967&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Apr 26
23:46:43 2011
@@ -6593,7 +6593,9 @@ def avoid_reflected_revs(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ None, None, None, None, None, 1,
+ None, A_COPY_path,
+ '--allow-mixed-revisions')
# Sync up with the trunk ie., A
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
@@ -6632,7 +6634,10 @@ def avoid_reflected_revs(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ None, None, None, None, None, 1,
+ None, A_COPY_path,
+ '--allow-mixed-revisions')
+
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
expected_output = wc.State(wc_dir, {
