Norbert Unterberg wrote:
> On Tue, Jun 17, 2008 at 3:57 PM, Mark Phippard <markphip_at_gmail.com> wrote:
>> On Tue, Jun 17, 2008 at 9: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....
>> I have not observed this. I also do not see how one client could
>> inject a problem on to a different client. The server is responsible
>> for storing the contents and providing it to the other client.
>
> Who performs the CRLF to LF conversion during a commit, the server or
> the client?
The client is responsible for this conversion. The text-base should always
be an exact replica of the repository contents.
--
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Received on 2008-06-17 16:37:51 CEST