You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Lieven Govaerts <lg...@mobsol.be> on 2006/07/26 05:53:51 UTC
Re: svn trunk r20864: FAIL (win32-xp VS2005)
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,
the Windows build started failing after your r20863. I checked the test
output log apparently update_tests 28 (conflict markers should match the
file's eol style) is the one that's failing.
I'll check tonight on my machine if the test works fine.
Lieven.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn trunk r20864: FAIL (win32-xp VS2005)
Posted by Erik Huelsmann <eh...@gmail.com>.
On 7/28/06, Lieven Govaerts <lg...@mobsol.be> wrote:
> 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.
We did. r20892 should do it.
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn trunk r20864: FAIL (win32-xp VS2005)
Posted by Lieven Govaerts <lg...@mobsol.be>.
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