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

RE: TortoiseMerge ( Feature request)

From: Mikkel Kirkgaard Nielsen <MKN_at_compugame.dk>
Date: 2006-06-01 01:32:06 CEST

[analyzing line differences]
>> Another idea is to embedd info about simple changes in the texts
>> The xxdiff *nix tool (http://furius.ca/xxdiff/) does this quite
>> elegantly, but it's inadequate for larger changes. See an example
>> TSVN here http://mikini.dk/misc/xxdiff%20shot.png, notice that
>> added/removed text is visible (small vertical bar) in both the old
>> new rev.
> What's wrong with the similar vertical bar on the left side of

Nothing, but it wasn't the locator bar I was referring to. I was just
pointing out a feature of xxdiff that I find useful for analyzing
changes in source code.

Xxdiff shows the changes in a line directly in the text by color coding
it (take a closer look at the shot), even indicating where text has been
removed in the revision where the text is missing (small vertical bar
before "value" in line 1650 of r6000 of TortoiseProc.cpp). This way you
only have to let you eyes wander down through one of the columns to see
all changes, and to assess the severity of the change.

Tortoisemerge on the other hand, only shows that the line has been
changed by striking it through in the old revision, and highlighting it
in the new. You'll have to move the mouse to the line in question and
look in the line diff bar to get help analyzing the change.

Look at how TortoiseMerge handles the same change
(http://mikini.dk/misc/tortoisemerge%20shot.png). Which one most
intuitively shows that the only change from line 1650 of r6000 to line
1738 in r6650 was addition of a cast?

> No scrollwheel? Seriously? Even my laptop has a scrollwheel 'feature'.
> Beside that: many mousedrivers already implement something like that
(usually activated by clicking the middle
> mousebutton). I don't intend to implement that in TMerge.

Well, I'm a trackball guy, so no, my TrackMan Marble FX doesn't have a
dedicated scroll whell. It has a scroll wheel feature but it isn't very
ergonomic to use as a real scroll wheel (holding a button while moving
the ball) so I find myself not using it much...
My idea was to make it possible to scroll horizontally too, by taking
the mouse movements as scroll direction. But if that's what the
ctrl+scroll wheel trick does then that's probably equally useable. I'll
have to try at work tomorrow...

Mikkel Kirkgaard Nielsen
-Software Engineer (B.sc EE)
-Compu-Game A/S, R & D dep.
-Phone: (+45) 76109877

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jun 1 01:31:15 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.