subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r981919 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
Date Tue, 03 Aug 2010 15:14:07 GMT
Author: julianfoad
Date: Tue Aug  3 15:14:07 2010
New Revision: 981919

URL: http://svn.apache.org/viewvc?rev=981919&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
  (committed_case_only_move_and_revert): Tweak to pass in SINGLE_DB mode.

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=981919&r1=981918&r2=981919&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Aug  3 15:14:07 2010
@@ -15247,6 +15247,8 @@ def committed_case_only_move_and_revert(
     })
   expected_disk.tweak('', props={SVN_PROP_MERGEINFO : '/A:3,5'})
   expected_disk.add({'c' : Item()})
+  if svntest.main.wc_is_singledb(wc_dir):
+    expected_disk.remove('C')
   expected_status.tweak('MU', status='  ', wc_rev=4, copied=None)
   expected_status.remove('mu')
   expected_status.tweak('C', status='D ')



Mime
View raw message