Author: philip
Date: Fri Jun 3 12:09:32 2011
New Revision: 1131006
URL: http://svn.apache.org/viewvc?rev=1131006&view=rev
Log:
Followup to r1131000 changed the upgrade error message.
* subversion/tests/cmdline/tree_conflict_tests.py
(actual_only_node_behaviour): Adjust expected error.
Modified:
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1131006&r1=1131005&r2=1131006&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Fri Jun 3
12:09:32 2011
@@ -1375,7 +1375,7 @@ def actual_only_node_behaviour(sbox):
# upgrade
expected_stdout = None
- expected_stderr = ".*Cannot upgrade.*foo.*"
+ expected_stderr = ".*Can't upgrade.*foo.*"
run_and_verify_svn(None, expected_stdout, expected_stderr,
"upgrade", foo_path)
