You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/02/09 02:17:18 UTC
svn commit: r1444307 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: rhuijben
Date: Sat Feb 9 01:17:17 2013
New Revision: 1444307
URL: http://svn.apache.org/r1444307
Log:
* subversion/tests/cmdline/merge_tests.py
(expected_out_and_err): Escape path to handle backslash separated paths on
Windows.
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=1444307&r1=1444306&r2=1444307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Sat Feb 9 01:17:17 2013
@@ -18306,7 +18306,7 @@ def expected_out_and_err(tgt_ospath,
if expect_error:
expected_err = RegexListOutput([
'^svn: E155015: .* conflicts were produced .* into$',
- "^'.*" + tgt_ospath + "' --$",
+ "^'.*" + re.escape(tgt_ospath) + "' --$",
'^resolve all conflicts .* remaining$',
'^unmerged revisions$'],
match_all=False)