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/08/30 12:46:19 UTC
svn commit: r990760 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: rhuijben
Date: Mon Aug 30 10:46:19 2010
New Revision: 990760
URL: http://svn.apache.org/viewvc?rev=990760&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(mergeinfo_inheritance): Skip the last part of the test when running as
single-db, because copying a subdir doesn't create a disconnected/
detached working copy.
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=990760&r1=990759&r2=990760&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Aug 30 10:46:19 2010
@@ -4786,6 +4786,11 @@ def mergeinfo_inheritance(sbox):
wc_status,
None,
wc_dir)
+
+ # In single-db mode you can't create a disconnected working copy by just
+ # copying a subdir
+ if svntest.main.wc_is_singledb(wc_dir):
+ return
# Copy the subtree A_COPY/B/E from the working copy, making the
# disconnected WC E_only.