Author: philip
Date: Mon Jun 13 12:47:23 2011
New Revision: 1135110
URL: http://svn.apache.org/viewvc?rev=1135110&view=rev
Log:
* subversion/tests/cmdline/diff_tests.py
(no_spurious_conflict): Enable sleep for timestamps so that all
commits work.
Modified:
subversion/trunk/subversion/tests/cmdline/diff_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1135110&r1=1135109&r2=1135110&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Mon Jun 13 12:47:23
2011
@@ -3779,6 +3779,8 @@ def no_spurious_conflict(sbox):
sbox.build()
wc_dir = sbox.wc_dir
+ svntest.actions.do_sleep_for_timestamps()
+
data_dir = os.path.join(os.path.dirname(sys.argv[0]), 'diff_tests_data')
shutil.copyfile(os.path.join(data_dir, '3449_spurious_v1'),
sbox.ospath('3449_spurious'))
