Author: julianfoad
Date: Wed Jan 29 10:25:04 2020
New Revision: 1873294
URL: http://svn.apache.org/viewvc?rev=1873294&view=rev
Log:
Fix test expectations of an XFAIL test.
For issue #4840 "Merge assertion failure in svn_sort__array_insert".
Modified:
subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
Modified: subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1873294&r1=1873293&r2=1873294&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Wed Jan 29
10:25:04 2020
@@ -1831,7 +1831,7 @@ test_rangelist_merge_array_insert_failur
SVN_ERR(svn_rangelist__parse(&ry, "1-9*,11", pool));
SVN_ERR(svn_rangelist_merge2(rx, ry, pool, pool));
SVN_ERR(svn_rangelist_to_string(&rxs, rx, pool));
- SVN_TEST_STRING_ASSERT(rxs->data, "1-9*,11");
+ SVN_TEST_STRING_ASSERT(rxs->data, "1-7*,8,9*,11");
/* Actual reported case: in v1.10.6, aborted; after r1872118, error
* "E200004: svn_sort__array_insert2:
