subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1489858 - /subversion/trunk/subversion/tests/cmdline/update_tests.py
Date Wed, 05 Jun 2013 13:29:19 GMT
Author: rhuijben
Date: Wed Jun  5 13:29:19 2013
New Revision: 1489858

URL: http://svn.apache.org/r1489858
Log:
* subversion/tests/cmdline/update_tests.py
  (imports): Following up on r1489856, fixup imports.

Modified:
    subversion/trunk/subversion/tests/cmdline/update_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1489858&r1=1489857&r2=1489858&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Wed Jun  5 13:29:19 2013
@@ -34,8 +34,8 @@ logger = logging.getLogger()
 # Our testing module
 import svntest
 from svntest import wc, actions, verify, deeptrees
-from merge_tests import expected_merge_output
-from merge_tests import set_up_branch
+from svntest.mergetrees import expected_merge_output
+from svntest.mergetrees import set_up_branch
 
 # (abbreviation)
 Skip = svntest.testcase.Skip_deco



Mime
View raw message