[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Bug (release blocker?): svn 1.5 eol-style:native on windows breaks version 1.4 wc

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: Tue, 17 Jun 2008 16:05:27 +0200

On 6/17/08, 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....

Are you sure the working copy you merged into as well as the merge
start *and* merge end all had eol-style native? If not, that could be
the problem.



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 16:05:46 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.