[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: Norbert Unterberg <nunterberg_at_gmail.com>
Date: Tue, 17 Jun 2008 16:41:51 +0200

On Tue, Jun 17, 2008 at 4:20 PM, John Peacock
<john.peacock_at_havurah-software.org> wrote:
> Norbert Unterberg wrote:
>> 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.
> Are you using a shared working copy by any chance? Were the files marked
> svn:eol-style "native" before your commit with the 1.5 client? If the answer
> to the first question is "No", are the text-base files in the 1.5 working
> copy LF or CRLF?

No shared WC at all, all on my local hard drive.
The svn:eol-style was not changed during the commit.
The text-base files in the 1.5 wc are LF only, but it seems that they
are CRLF in the repository.
Unfortunately I have never used svnlook on the server side so I can
not be sure, but a svn diff with the 1.4 client shows all lines as

> Regardless of these answers, I would strongly recommend that you convert the
> server to 1.4.6 at your earliest convenience; 1.3.2 is very old and there
> have been numerous improvements since then (not the least of which is
> improved storage compression). You will need to do a dump/reload to do
> this...

We are just planning to upgrade together with a Trac upgrade in a few weeks.
But are you saying that 1.5 clients are no longer compatible with 1.3 servers?

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:42:08 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.