Re: [PATCH]: Fix issue #4128

Hi, Philip,

Von: MARTIN PHILIP [codematters_at_ntlworld.com]" im Auftrag von "Philip Martin
> Philip Martin <philip.martin_at_wandisco.com> writes:
>> Markus Schaber <m.schaber_at_3s-software.com> writes:
>>> Here's the second iteration:
>>>
>>> [[[
>>> libsvn_wc: no conflict for identical files
>>>
>>> [ in subversion/libsvn_wc ]
>>>
>>> * merge.c
>>> (merge_file_trivial): Successful report merged when incoming file is identical to existing, locally modified file.
>>>
>>> [ in subversion/tests/cmdline ]
>>> * update_tests.py
>>> (update_binary_file_3): Remove XFAIL marker.
>>>
>>> ]]]
>>
>> Have you run the regression tests? I get:

No, to be honest, I had problems running them (Error 2) - looks like some path issue. Bert wanted to send me his script for running them, but it did not arrive yet.

I'll see what the problem is...

>> FAIL: merge_tests.py 1: performing a merge, with mixed results
>> FAIL: merge_tests.py 70: cyclic merges don't add mergeinfo from own history
>> FAIL: merge_tests.py 93: natural history filtering permits valid mergeinfo
>> FAIL: update_tests.py 66: update locally modified file to equal versions
>>
>> The update test fail is because you need to set the expected_output to
>> 'G '. I haven't looked at the others.

I'll run them, and modify them as needed.

> The patch uses tabs for indentation. Please use spaces.

I'll fix that, too.

Thanks,
Markus

--
Philip