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

Re: [TSVN] TMerge and Lineendings

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-08-29 18:36:24 CEST

Klaus Drechsler wrote:

> "Ignore Lineendings" is _not_ checked (so TMerge should show Lineendings,
> but I tried both, so it doesn´t really matter).
>
> The unified Diff looks like that:
>
> @@ -106,4 +106,4 @@
> }
>
> return (ret>>ADC_AVERAGE_COUNTER);
> -}
> \ No newline at end of file
> +}
>
>
> But TMerge does not show me the missing newline at the end of the file.
>
> I think this is a bug!?

I know that. In fact, I've know that TMerge behaves this way since day
one. The reason for this is that it reads a text file line by line, and
keeps only the *lines* as a stringarray, without the lineendings. So it
doesn't see if a line at the end really has a lineending or not.

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 Mon Aug 29 18:36:51 2005

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