Author: pburba
Date: Tue Jan 8 21:53:17 2013
New Revision: 1430561
URL: http://svn.apache.org/viewvc?rev=1430561&view=rev
Log:
Tweak new merge test to make it run properly on Windows.
* subversion/tests/cmdline/merge_tests.py
(merge_conflict_when_keywords_removed): Don't use hard-coded path
separators.
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=1430561&r1=1430560&r2=1430561&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Jan 8
21:53:17 2013
@@ -17936,7 +17936,7 @@ def merge_conflict_when_keywords_removed
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[3,4]],
- ['U A2/keyfile\n',
+ ['U '+ sbox.ospath('A2/keyfile') + '\n',
' U A2\n']),
[], 'merge', '^/A', 'A2')
sbox.simple_commit()
@@ -17951,7 +17951,7 @@ def merge_conflict_when_keywords_removed
svntest.actions.run_and_verify_svn(
None,
expected_merge_output([[5,6]],
- ['UU A2/keyfile\n',
+ ['UU ' + sbox.ospath('A2/keyfile') + '\n',
' U A2\n']),
[], 'merge', '--accept=postpone', '^/A', 'A2')
