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

Re: [TSVN] Tortoise Merge improperly detects CR LF in Macintosh files

From: SteveKing <stefankueng_at_gmail.com>
Date: 2005-04-01 08:42:37 CEST

On Apr 1, 2005 7:41 AM, Aldevinas - UAB Klaipedos Stabilios Sistemos
<ak@stabilios-sistemos.lt> wrote:
> Hello,
> I noticed that Tortoise Merge improperly detects CR LF in Macintosh files,
> it shows all changes as a one (1) change. In fact Mac file is treated by
> merge as having a single line. By the way some other diffs such as CSDiff
> also have this problem.

As mentioned before: TortoiseMerge does not support files with MAC
style endings. And it never will. Are there even MAC users out there?
I mean MAC, not OSX! Only the very first MACs used that lineending
style, modern Apple computers use the linux lineending style.

And why should TortoiseMerge work with those? If you have problems
with lineendings, set the svn:eol-style property of those files to
'native' and everything will be ok.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Apr 1 08:43:09 2005

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

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