You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2018/07/29 13:13:49 UTC
svn commit: r1836975 -
/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Author: stsp
Date: Sun Jul 29 13:13:49 2018
New Revision: 1836975
URL: http://svn.apache.org/viewvc?rev=1836975&view=rev
Log:
Follow-up to r1836972: Fix accidental test fallout.
* subversion/tests/cmdline/tree_conflict_tests.py
(ensure_tree_conflict): Pass --accept=postpone to 'svn merge' to override
the conflict resolver and get the behaviour these tests are expecting.
Modified:
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1836975&r1=1836974&r2=1836975&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Sun Jul 29 13:13:49 2018
@@ -473,6 +473,7 @@ def ensure_tree_conflict(sbox, operation
run_and_verify_svn(expected_stdout, [],
'merge',
'--allow-mixed-revisions',
+ '--accept=postpone',
'-r', str(source_left_rev) + ':' + str(source_right_rev),
source_url, target_path)
else: