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

[ph...@apache.org]

Author: philip
Date: Fri Aug  6 10:07:19 2010
New Revision: 982919

URL: http://svn.apache.org/viewvc?rev=982919&view=rev
Log:
Make merge_tests.py 51 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
  (merge_loses_mergeinfo): 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=982919&r1=982918&r2=982919&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Aug  6 10:07:19 2010
@@ -6788,6 +6788,8 @@ def merge_loses_mergeinfo(sbox):
     '' : Item(status=' U'),
     })
   expected_disk = wc.State('', {'J': Item()})
+  if svntest.main.wc_is_singledb(wc_dir):
+    expected_disk.remove('J')
   expected_status = wc.State(A_C_wc_dir,
                              { ''    : Item(wc_rev=4, status=' M'),
                                'J'   : Item(wc_rev=4, status='D ')
@@ -6809,6 +6811,8 @@ def merge_loses_mergeinfo(sbox):
     'J'       : Item(),
     ''        : Item(props={SVN_PROP_MERGEINFO : '/A/B:3'}),
     })
+  if svntest.main.wc_is_singledb(wc_dir):
+    expected_disk.remove('J')
   expected_status = wc.State(A_C_wc_dir,
                              { ''    : Item(wc_rev=4, status=' M'),
                                'K'   : Item(status='A ',