Author: rhuijben
Date: Mon Jan 21 22:21:09 2013
New Revision: 1436658
URL: http://svn.apache.org/viewvc?rev=1436658&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(merge_target_selection): Extend test with another bad target.
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=1436658&r1=1436657&r2=1436658&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Jan 21
22:21:09 2013
@@ -18071,6 +18071,15 @@ def merge_target_selection(sbox):
svntest.actions.run_and_verify_svn(None, None, expected_error,
'merge', '^/dir/binary-file', '-c', '4',
'.')
+ svntest.main.run_svn(None, 'revert', '-R', '.')
+
+ # Merge the dir (wrong target)
+ expected_error = 'svn: E160017: (.* is not a file|' + \
+ 'Attempted to get checksum.*|' + \
+ '.* of a directory)'
+ svntest.actions.run_and_verify_svn(None, None, expected_error,
+ 'merge', '^/dir', '-c', '4',
'binary-file')
+
########################################################################
# Run the tests
