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

[ph...@apache.org]

Author: philip
Date: Fri Aug  6 10:00:49 2010
New Revision: 982916

URL: http://svn.apache.org/viewvc?rev=982916&view=rev
Log:
Make merge_tests.py 95 pass in single-db. Deleted directories
are removed from disk in single-db, but remain until commit in
per-directory-db.

* subversion/tests/cmdline/merge_tests.py
  (no_self_referential_filtering_on_added_path): Tweak expectations for
   single-db.

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=982916&r1=982915&r2=982916&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Aug  6 10:00:49 2010
@@ -13775,6 +13775,8 @@ def no_self_referential_filtering_on_add
     'D/H/psi'   : Item("New content"),
     'D/H/omega' : Item("New content"),
     })
+  if svntest.main.wc_is_singledb(wc_dir):
+    expected_A_COPY_2_disk.remove('C')
   expected_A_COPY_2_skip = wc.State(A_COPY_2_path, { })
   svntest.actions.run_and_verify_merge(A_COPY_2_path, None, None,
                                        sbox.repo_url + '/A', None,