subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r930926 - /subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
Date Mon, 05 Apr 2010 18:33:03 GMT
Author: pburba
Date: Mon Apr  5 18:33:02 2010
New Revision: 930926

URL: http://svn.apache.org/viewvc?rev=930926&view=rev
Log:
Follow-up to r930921, fix a busted test.

* subversion/tests/cmdline/mergeinfo_tests.py

  (recursive_mergeinf): Put new test coverage here, where it was intended...

  (mergeinfo_on_pegged_wc_path): ...and remove it from this test.

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

Modified: subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py?rev=930926&r1=930925&r2=930926&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Mon Apr  5 18:33:02 2010
@@ -221,6 +221,10 @@ def non_inheritable_mergeinfo(sbox):
                                            D_COPY_path,
                                            '--show-revs', 'eligible')
 
+# Test for -R option with svn mergeinfo subcommand.
+#
+# Test for issue #3242 'Subversion demands unnecessary access to parent
+# directories of operations'
 def recursive_mergeinfo(sbox):
   "test svn mergeinfo -R"
 
@@ -357,10 +361,22 @@ def recursive_mergeinfo(sbox):
                                            '--show-revs', 'merged',
                                            '--depth', 'infinity')
 
+  # A couple tests of problems found with initial issue #3242 fixes.
+  # We should be able to check for the merged revs from a URL to a URL
+  # when the latter has explicit mergeinfo...
+  svntest.actions.run_and_verify_mergeinfo(
+    adjust_error_for_server_version(''), ['6'],
+    sbox.repo_url + '/A2/D/H',
+    sbox.repo_url + '/A_COPY/D/H',
+    '--show-revs', 'merged')
+  # ...and when the latter has inherited mergeinfo.
+  svntest.actions.run_and_verify_mergeinfo(
+    adjust_error_for_server_version(''), ['6'],
+    sbox.repo_url + '/A2/D/H/omega',
+    sbox.repo_url + '/A_COPY/D/H/omega',
+    '--show-revs', 'merged')
+  
 # Test for issue #3180 'svn mergeinfo ignores peg rev for WC target'.
-#
-# Test for issue #3242 'Subversion demands unnecessary access to parent
-# directories of operations'
 def mergeinfo_on_pegged_wc_path(sbox):
   "svn mergeinfo on pegged working copy target"
 
@@ -461,21 +477,6 @@ def mergeinfo_on_pegged_wc_path(sbox):
     adjust_error_for_server_version(''),
     ['4', '5'], A_path, A_COPY_path + '@PREV', '--show-revs', 'eligible')
 
-  # A couple tests of problems found with initial issue #3242 fixes.
-  # We should be able to check for the merged revs from a URL to a URL
-  # when the latter has explicit mergeinfo...
-  svntest.actions.run_and_verify_mergeinfo(
-    adjust_error_for_server_version(''), ['6'],
-    sbox.repo_url + 'A2/D/H',
-    sbox.repo_url + 'A_COPY/D/H',
-    '--show-revs', 'merged')
-  # ...and when the latter has inherited mergeinfo.
-  svntest.actions.run_and_verify_mergeinfo(
-    adjust_error_for_server_version(''), ['6'],
-    sbox.repo_url + 'A2/D/H/omega',
-    sbox.repo_url + 'A_COPY/D/H/omega',
-    '--show-revs', 'merged')
-
 ########################################################################
 # Run the tests
 



Mime
View raw message