[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn_tests: E200006: failed merging diff 'foo6d' to 'bar6d' into 'foo6d'; Found: "XX\n", Expected: "Cc\n\n"

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Sun, 26 Jun 2011 23:32:18 +0200

On Sun, Jun 26, 2011 at 11:08 PM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:
> On Sun, Jun 26, 2011 at 5:35 PM, Daniel Shahaf <d.s_at_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
Received on 2011-06-26 23:33:10 CEST

This is an archived mail posted to the Subversion Dev mailing list.