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

[TSVN] Re: TMerge line-end bugs

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-11-05 11:12:44 CET

SteveKing 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?

> In the meantime, try the next nightly build and the new graphs from
> the log dialog ;)

Having a look now :-)

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Nov 5 11:28:27 2004

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.