Re: [TSVN] Re: TMerge line-end bugs

On Fri, 5 Nov 2004 10:12:44 -0000, Simon Large <slarge@blazepoint.co.uk> wrote:
> > Simon Large wrote:
> >
> >> I have just encountered 2 problems with TMerge.
> >> 2. I changed a single character in 1 line of a text file. I then used
> >> TMerge to diff with the base copy with TMerge's 'ignore-line-ending'
> >> setting turned off. In that case it shows me that _every_ line in the
> >> file differs.
> >
> > Sure. The base copy always has LF lineendings. And therefore every
> > line
> > is different (has a different lineending) than the one in your
> > working copy.
>
> What happens in 3rd party diff/merge tools? Do they all have the ability
> to ignore lineending?

The ones that don't won't be used very long. I can't imagine someone
actually using such a diff/merge tool.

> > In the meantime, try the next nightly build and the new graphs from
> > the log dialog ;)
>
> Having a look now :-)

It has some problems with big data sizes. E.g. if you show it for the
complete Subversion /trunk log you'll get some problems...

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