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

RE: Bug in diff

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2006-12-20 11:11:41 CET

Hi Stefan,

You wrote:
> Remember the color settings dialog in TMerge from three years ago?
> I attached the screenshot, take a look (it's
> http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/doc/images
> /SettingsColors2.png from revision 553).

Nice screenshot. Thats a good example for a bad example :) and clearly shows
why this dialog didn't make it.

> You see, it's definitely possible to use more colors. But if you
> remember, people complained that the settings dialog was crowded and
> they wanted fewer colors.
>
> Some suggestions for a compromise here?

I'm not asking for 20 different colour for all theoretically possible
combinations plus foreground/background.

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.

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.

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

I have attached a manually coloured TortoiseMerge diff (don't beat me on the
details) plus an example how a 12-colour settings dialog could look like.

After all it's just a suggestion for improvement, not a criticism.

Cheers
- Lübbe

--
       ___
  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 Dec 20 11:11:55 2006

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.