On Tue, Jun 17, 2008 at 10:40 PM, David Glasser
<glasser_at_davidglasser.net> wrote:
> On Tue, Jun 17, 2008 at 6:53 AM, Norbert Unterberg <nunterberg_at_gmail.com> wrote:
>> I am using TortoiseSVN 1.5 rc3 (based on svn 1.5-rc9) on Windows XP.
>>
>> One of my collegues gets strange merge conflicts while using his svn
>> 1.4 client after I checked in some changes. The files all have
>> svn:eol-style set to "native". The server is still running on svn
>> 1.3.2
>> Analysis showed that svn 1.4 clients always stored the text file in LF
>> encoding regardless of the eol-style. The file in the wc itself is
>> correctly stored in CRLF style on Windows.
>>
>> However, after commiting with my 1.5 client and updating with 1.4 on
>> the other machine, the files in the text-base were also stored in CRLF
>> style. When merging, this generates merge conflicts for the entiere
>> file because every line is different.
>>
>> If this is problem is still present in the current RC, I'd say this
>> could be a release blocker since it breaks all the older clients
>> working copies....
>
> Norbert, this does seem like a problem.
>
> Can you give us a detailed recipe that consistently reproduces it?
>
> Without that, we're reduced to asking little questions step by step
> like we have been for the past few hours, which really isn't
> productive :-)
I thought that this might come up, but unfortunately I am no longer in
the office where it happened. I'll try to do my best to reproduce it
here on my home pc.
Norbert
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-17 22:44:27 CEST