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

Re: [TSVN] Wrong colors in TortoiseMerge?

From: SteveKing <stefankueng_at_gmail.com>
Date: 2004-12-07 15:03:59 CET

On Tue, 7 Dec 2004 14:52:58 +0100, Thomas Börkel <tbo@ap-ag.com> wrote:

> I have made some tests with Merge and I think, TortoiseMerge shows the wrong
> color for changes in "Yours"-only.
> Changes only in "Yours" have the same color as changes identical in "Yours"
> and "Theirs" in the "Yours" window.

Changes in "yours" aren't that important. Because that's what _you_
changed (and you should really know what you've changed yourself).
So if you changed something, it's the same as if you and someone else
did the same change to the file --> it's not that important.

> Changes only in "Theirs" have different colors than changes identical in
> "Yours" and "Theirs" in the "Theirs" window.

Changes in "theirs" means a change you have to look at closely,
because that's a change from someone else which you don't know yet.
But if "they" changed the same thing as "you", then it's not important
anymore and though the color is different.

> In the "Merged" window, the colors are OK.
> Please look at http://www.boerkel.de/TM.jpg.
> In the "Yours" window, 8a, 10 and 12 have the same color.
> In the "Merged" window, only 8a and 10 have the same color (different than
> in the "Yours" window).
> Is this a bug or as it should be? Using Tortoise build 1971.

It's as it should be. Just think about what's important and needs a
different color than something else.
In the beginning of TMerge, I had a different color for almost every
possible change/situation. That lead to _two_ settings tabs filled
with color selectors. And the output looked like an outburst of the
karneval. So I reduced the colors and now TMerge uses the same color
for similar diff types. But it still works as it should - that's the
only good way to reduce the amount of colors (differ between
'important' and 'not so important').


  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
Received on Tue Dec 7 15:04:36 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.