subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1570030 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Date Thu, 20 Feb 2014 01:14:38 GMT
Author: rhuijben
Date: Thu Feb 20 01:14:38 2014
New Revision: 1570030

URL: http://svn.apache.org/r1570030
Log:
* subversion/tests/cmdline/tree_conflict_tests.py
  (actual_only_node_behaviour):
     Following up on r1570024, update 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=1570030&r1=1570029&r2=1570030&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Thu Feb 20 01:14:38 2014
@@ -1238,7 +1238,7 @@ def actual_only_node_behaviour(sbox):
 
   # diff (di)
   expected_stdout = None
-  expected_stderr = ".*foo.*is not under version control.*"
+  expected_stderr = ".*E155.*foo.*was not found.*"
   run_and_verify_svn(None, expected_stdout, expected_stderr,
                      "diff", foo_path)
   # export



Mime
View raw message