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

Re: TSVN 1.5RC3 and svn:eol-style=native breaks 1.4 client merges

From: Norbert Unterberg <nunterberg_at_gmail.com>
Date: Wed, 18 Jun 2008 10:36:15 +0200

On Tue, Jun 17, 2008 at 9:30 PM, Norbert Unterberg <nunterberg_at_gmail.com> wrote:
> We are having trouble with SVN in out company.
> After I installed TSVN 1.5-RC3 I did checkin some source files on our
> project's trunk that had svn:eol-style set to "native". Everything
> looks fine.
> But some days later, a collegue was performing a merge with his TSVN
> 1.4.3 from trunk to a branch and go strange merge conflicts.

Please ignore this post. The commit in question was done with a very
old nightly build and not with the current RC3.
Sorry for the noise.


To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-06-18 10:36:35 CEST

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