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

Re: Enhancement: expressiveness of the diff view on differing EOL markers

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-07-18 21:32:42 CEST

Ulf Zibis wrote:
> Am 18.07.2007 14:50, Stefan Küng schrieb:
>> TortoiseMerge uses words as chunks to diff. And words are (currently)
>> defined as separated by spaces. In your case here, there was a comma,
>> not a space.
>> That means TortoiseMerge only got one big chunk (the whole line).
> Sorry that I insist. Havn't we 2 chunks here?
> "Time:" and "0,265" ?

Yes of course. But the decision is not only made by that.
TortoiseMerge only shows inline diffs iff:
* the number of unmodified chunks is higher than the number of different
* the combined length of all unmodified chunks is longer than the
combined length of all different chunks.

I've reduced this a little bit now, so the next nightly will show there
an inline diff.

>>> By the way: Is TSVN mainly developed by a german team ? Where you from
>>> in Germany ?
>> Now that's an insult :)
>> I may be speaking German (ok, I admit: most German would object even
>> to that), but I don't live there - I'm from Switzerland :)
> You Swiss are proud about your nationality. I like this, and your better
> democracy.

I wouldn't say better, it's just different. Everything has its
advantages, and everything has its disadvantages. There is no perfect
solution to anything.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jul 18 21:32:13 2007

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.