svn commit: r1001770 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py

[st...@apache.org]

Author: stsp
Date: Mon Sep 27 15:06:27 2010
New Revision: 1001770

URL: http://svn.apache.org/viewvc?rev=1001770&view=rev
Log:
* subversion/tests/cmdline/merge_reintegrate_tests.py
  (two_URL_merge_removes_valid_mergefino_from_target): Rename to
   two_URL_merge_removes_valid_mergeinfo_from_target.
  (test_list): Adjust.

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

Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1001770&r1=1001769&r2=1001770&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Mon Sep 27 15:06:27 2010
@@ -2075,8 +2075,8 @@ def added_subtrees_with_mergeinfo_break_
 #----------------------------------------------------------------------
 # Test for issue #3648 '2-URL merges incorrectly reverse-merge mergeinfo
 # for merge target'.
-def two_URL_merge_removes_valid_mergefino_from_target(sbox):
-  "2-URL merge removes valid mergefino from target"
+def two_URL_merge_removes_valid_mergeinfo_from_target(sbox):
+  "2-URL merge removes valid mergeinfo from target"
 
   sbox.build()
   wc_dir = sbox.wc_dir
@@ -2254,7 +2254,7 @@ test_list = [ None,
                          server_has_mergeinfo),
               reintegrate_with_self_referential_mergeinfo,
               added_subtrees_with_mergeinfo_break_reintegrate,
-              two_URL_merge_removes_valid_mergefino_from_target,
+              two_URL_merge_removes_valid_mergeinfo_from_target,
              ]
 
 if __name__ == '__main__':