On Sun, Jun 26, 2011 at 11:08 PM, Johan Corveleyn <jcor...@gmail.com> wrote: > On Sun, Jun 26, 2011 at 5:35 PM, Daniel Shahaf <d...@daniel.shahaf.name> > wrote: >> libsvn_diff/diff-diff3-test 2 >> fails for me: >> >> [[[ >> subversion/tests/libsvn_diff/diff-diff3-test.c:653: (apr_err=200006) >> subversion/tests/libsvn_diff/diff-diff3-test.c:316: (apr_err=200006) >> subversion/tests/libsvn_diff/diff-diff3-test.c:220: (apr_err=200006) >> svn_tests: E200006: failed merging diff 'foo6d' to 'bar6d' into 'foo6d'; >> FOUND: >> Xx >> EXPECTED: >> Cc >> >> FAIL: lt-diff-diff3-test 2: 2-way unified diff and trivial merge >> ]]] >> >> >> It fails with HEAD and with every revision I've tried, from r1128856 to >> r1139812. >> >> I build with -DSVN_UNALIGNED_ACCESS_IS_OK=0 -DSUFFIX_LINES_TO_KEEP=0, >> but these two alone don't are not sufficient to reproduce the issue. > > I don't understand. What do you mean with "these two alone are not > sufficient to reproduce the issue."? Do you mean you tried it with > those two options on system A, and it doesn't reproduce the issue, and > with those two options on system B it does reproduce? If so, what's > the difference between A and B? > > Or am I missing something?
Adding a datapoint: I cannot reproduce this on my system (Win XP, 32 bit), with -DSVN_UNALIGNED_ACCESS_IS_OK=0 and -DSUFFIX_LINES_TO_KEEP=0. -- Johan
