Author: pburba
Date: Tue Aug 31 23:40:02 2010
New Revision: 991396
URL: http://svn.apache.org/viewvc?rev=991396&view=rev
Log:
Follow-up to r991384.
* subversion/tests/cmdline/input_validation_tests.py
(invalid_merge_args): The dangers of multiple WCs: Tested the change in
one, committed from another, forget something along the way.
Modified:
subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/input_validation_tests.py?rev=991396&r1=991395&r2=991396&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/input_validation_tests.py Tue Aug
31 23:40:02 2010
@@ -157,8 +157,7 @@ def invalid_merge_args(sbox):
for (src, target) in [('i...@head', '^/'), ('i...@base', 'file://')]:
run_and_verify_svn_in_wc(sbox, "svn: Merge sources must both be either "
"paths or URLs", 'merge', src, target)
- run_and_verify_svn_in_wc(sbox, "svn: Merge target.*does not exist in " +
- "the working copy",
+ run_and_verify_svn_in_wc(sbox, "svn: Path '.*' does not exist",
'merge', 'i...@base', 'i...@head', 'nonexistent')
run_and_verify_svn_in_wc(sbox, "svn: Too many arguments given",
'merge', '-c42', '^/A/B', '^/A/C', 'iota')
