subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1139349 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Date Fri, 24 Jun 2011 15:08:18 GMT
Author: danielsh
Date: Fri Jun 24 15:08:18 2011
New Revision: 1139349

URL: http://svn.apache.org/viewvc?rev=1139349&view=rev
Log:
* subversion/tests/cmdline/tree_conflict_tests.py
  (update_dir_with_not_present): Tweak regex for grep-friendliness.

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=1139349&r1=1139348&r2=1139349&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Fri Jun 24 15:08:18 2011
@@ -1400,7 +1400,7 @@ def update_dir_with_not_present(sbox):
   sbox.simple_rm('A/B')
 
   # We can't commit this without updating (ra_svn produces its own error)
-  run_and_verify_svn(None, None, "svn: E(155011|160028): Dir.*B.*out of date",
+  run_and_verify_svn(None, None, "svn: (E155011|E160028): Dir.*B.*out of date",
                      'ci', '-m', '', wc_dir)
 
   # So we run update



Mime
View raw message