You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ph...@apache.org on 2010/08/19 19:09:46 UTC

svn commit: r987235 - /subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py

Author: philip
Date: Thu Aug 19 17:09:46 2010
New Revision: 987235

URL: http://svn.apache.org/viewvc?rev=987235&view=rev
Log:
Make merge_tree_conflict.py 7 pass in single-db.

* subversion/tests/cmdline/merge_tree_conflict_tests.py
  (mergeinfo_recording_in_skipped_merge): Tweak expected disk.

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

Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=987235&r1=987234&r2=987235&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Thu Aug 19 17:09:46 2010
@@ -623,6 +623,9 @@ def mergeinfo_recording_in_skipped_merge
     'D/H/omega': Item("This is the file 'omega'.\n"),
     'D/H/psi'  : Item("This is the file 'psi'.\n"),
     })
+  if svntest.main.wc_is_singledb(sbox.wc_dir):
+    # Delete removes directories in single-db
+    expected_disk.remove('B/E')
   expected_skip = wc.State(A_COPY_path, {})
   svntest.actions.run_and_verify_merge(A_COPY_path, None, None,
                                        A_url, None,