On Tue, Jun 17, 2008 at 10:44 PM, Norbert Unterberg
<nunterberg_at_gmail.com> wrote:
> 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.
[...]
>> Norbert, this does seem like a problem.
>>
>> Can you give us a detailed recipe that consistently reproduces it?
[..]
> 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.
I can not duplicate it here with file:// access. I will try tomorrow
on the "real" server in the office,
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 23:24:14 CEST