Author: danielsh
Date: Fri Jul 31 23:46:37 2015
New Revision: 1693670
URL: http://svn.apache.org/r1693670
Log:
* subversion/tests/cmdline/svnadmin_tests.py
(mergeinfo_race): Document a second bug this test was found to be triggering.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1693670&r1=1693669&r2=1693670&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Jul 31
23:46:37 2015
@@ -2012,6 +2012,14 @@ def mergeinfo_race(sbox):
"concurrent mergeinfo commits invalidate pred-count"
sbox.build()
+ # This test exercises two commit-time race condition bugs:
+ #
+ # (a) metadata corruption when concurrent commits change svn:mergeinfo
(issue #4129)
+ # (b) false positive SVN_ERR_FS_CONFLICT error with httpv1 commits
+ #
https://mail-archives.apache.org/mod_mbox/subversion-dev/201507.mbox/%[email protected]%3E
+ #
+ # Both bugs are timing-dependent and might not reproduce 100% of the time.
+
wc_dir = sbox.wc_dir
wc2_dir = sbox.add_wc_path('2')