You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/04/10 00:33:20 UTC

svn commit: r932639 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

Author: rhuijben
Date: Fri Apr  9 22:33:20 2010
New Revision: 932639

URL: http://svn.apache.org/viewvc?rev=932639&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
  (test_list): Following up on r932469 and r932617, re-enable the test
    added in r932469.

Found by: gstein

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=932639&r1=932638&r2=932639&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Apr  9 22:33:20 2010
@@ -19118,6 +19118,7 @@ test_list = [ None,
               merge_into_wc_for_deleted_branch,
               reintegrate_with_self_referential_mergeinfo,
               reintegrate_with_subtree_merges,
+              foreign_repos_del_and_props,
              ]
 
 if __name__ == '__main__':