Re: svn trunk r20864: FAIL (win32-xp VS2005)

Lieven Govaerts wrote:
> buildbot@mobsol.be wrote:
>> Full details are available at:
>> http://www.mobsol.be/buildbot/win32-xp%2520VS2005/builds/316
>>
>> Author list: dionisos
>>
>> Build Slave: djh-xp-vse2005
>>
>>
>> Subversion Buildbot
>> http://www.mobsol.be/buildbot/
>>
Erik,

I've checked the behavior of your new code on Windows with eol-style set
to native, and I'm pretty sure it doesn't handle conflicts during
updates correctly.

During a debug session, this is what I noticed:

1. The mu.svn-base file has eol LF, eol-style property set to native
2. The mu file in the wc has eol CRLF
3. During the update, a temporary file is created, which supposedly
contains a detranslated form of file my. However, this file still has
eol-style CRLF which is not correct.

4. That temp file is compared with the base file, obviously creating a
full conflict.

I tried to fix this problem in detranslate_wc_file, to force it to
translate the working copy file to LF eols in case of eol-style=native,
but then update_tests 29 fails (I don't know why, it doesn't use native
eol).

Let's discuss on IRC.

regards,

Lieven.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 28 17:05:58 2006