Author: rhuijben
Date: Sun Aug 28 21:26:50 2016
New Revision: 1758153
URL: http://svn.apache.org/viewvc?rev=1758153&view=rev
Log:
Following up on r1758128 and r1758130, fix the test by passing the right
paths.
Patch by: luke1410
* subversion/tests/cmdline/resolve_tests.py
(automatic_binary_conflict_resolution): Pass the right paths.
Modified:
subversion/trunk/subversion/tests/cmdline/resolve_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/resolve_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/resolve_tests.py?rev=1758153&r1=1758152&r2=1758153&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/resolve_tests.py Sun Aug 28
21:26:50 2016
@@ -642,19 +642,19 @@ def automatic_binary_conflict_resolution
# Test 'svn resolve -R --accept base'
do_binary_conflicting_merge()
- svntest.actions.run_and_verify_resolve([A_COPY_path],
+ svntest.actions.run_and_verify_resolve([theta_branch_path],
'-R', '--accept', 'base',
A_COPY_path)
# Test 'svn resolve -R --accept mine-full'
do_binary_conflicting_merge()
- svntest.actions.run_and_verify_resolve([A_COPY_path],
+ svntest.actions.run_and_verify_resolve([theta_branch_path],
'-R', '--accept', 'mine-full',
A_COPY_path)
# Test 'svn resolve -R --accept theirs-full'
do_binary_conflicting_merge()
- svntest.actions.run_and_verify_resolve([A_COPY_path],
+ svntest.actions.run_and_verify_resolve([theta_branch_path],
'-R', '--accept', 'tf',
A_COPY_path)
