Re: Bug in diff

Lübbe Onken wrote:

> I'm asking whether it is possible to treat changed lines as changed and not
> as added/deleted and - if possible - colour them accordingly. If not forget
> it.

It's possible. We can just use our algorithm which decides whether to
show the inline diffs or not (counting the inline diff chunks).

> Talking about the number of colours. IMO you need three base colours
> (added/changed/deleted) for line diffs plus one highlight colour for
> conflicted lines. The added/deleted coulours can be re-used for for inline
> diffs, giving you four colours in total.
> Add two if you want to colour inline diffs different from line diffs and you
> end up with six. I don't know if we really need added/deleted for the inline
> diffs or if a single "Changed text in changed line" colour would be
> sufficient. Does this give us "more" information"? I think a colour settings
> dialog with five to six colours is sufficient for TortoiseMerge.
>
> If you want to change the foreground too, which might be nice for people who
> need high contrast, you get ten to twelve colours in total.
>
> Currently TortoiseMerge has seven colours and I don't understand why you
> offer the option to set the standard background and blank background.
> Especially "blank" is an indicator for added/deleted lines if you look at
> the result and "normal" should be the normal windows window background
> anyway.

Have a look at revision 8353. Maybe that's good enough?

> Hey list. Is anyone using "normal" and "blank" at all?!?

I could agree with "normal", but "blank" is important. Because it shows
that a line hasn't just been replaced but really added (and that there
was no line there before).

Stefan

-- 
        ___
   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