svn commit: r930921 - /subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py

[pb...@apache.org]

Author: pburba
Date: Mon Apr  5 17:55:18 2010
New Revision: 930921

URL: http://svn.apache.org/viewvc?rev=930921&view=rev
Log:
Expand mergeinfo_tests.py 7 to cover the use cases where the targets of the
svn mergeinfo subcommand are URLs with explicit and inherited mergeinfo.

Note: This test still passes, but now covers some known problem areas in
forthcoming issue #3242 fixes.

* subversion/tests/cmdline/mergeinfo_tests.py
  (mergeinfo_on_pegged_wc_path): Tweak tests as above.

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=930921&r1=930920&r2=930921&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Mon Apr  5 17:55:18 2010
@@ -358,6 +358,9 @@ def recursive_mergeinfo(sbox):
                                            '--depth', 'infinity')
 
 # 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"
 
@@ -458,6 +461,21 @@ 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