Author: rhuijben
Date: Mon Jan 21 23:35:15 2013
New Revision: 1436687
URL: http://svn.apache.org/viewvc?rev=1436687&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(merge_target_selection): Ensure that the filesize changes to avoid missing
changes during status walking with sleeps disabled.
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=1436687&r1=1436686&r2=1436687&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Jan 21
23:35:15 2013
@@ -18011,7 +18011,8 @@ def merge_target_selection(sbox):
sbox.simple_commit()
# r4
- svntest.main.file_write(sbox.ospath('dir/binary-file'), '\5\4\3\2\1')
+ svntest.main.file_write(sbox.ospath('dir/binary-file'),
+ '\9\8\7\6\5\4\3\2\1')
sbox.simple_commit()
sbox.simple_update()
