Jean-Marc van Leerdam wrote:
> As we're discussing the color scheme of TMerge I noticed some things
> about TMerge:
>
> 1. the line-diff window is only showing when in two-pane mode. Is
> that intended?
yes.
> 2. The two-pane icon is depressed/selected when in one-pane mode and
> unselected when in two-pane mode. I would expect the behaviour to be
> the other way around.
Fixed in revision 2835.
> 3. (or is this a RTFM?): When in two-pane mode, the left pane is
> showing the 'oldest' version of a file (i.e. WC base when the right is
> showing the actual file in the WC). Is there a way to get the left
> pane to show the 'newest' version? I expected the latest/most current
> version of a file on the left and the previous one on the right. I
> start TMerge by doubleclicking on a log-message that is shown after a
> show-log for a file.
There's no way to switch that. TSVN calls TMerge that way.
Ok, you could specify TortoiseMerge as a "custom" diff program and pass
the parameters and paths the other way around...
> 4. There is a difference between the files that will be shown in
> TMerge when doubleclicking on a log message or on the line with the
> filename in the lowest pane (the log-message brings up a diff between
> the current WC file and the revision listed before the log message;
> the file name entry shows a diff between the listed revision and the
> prior revision). That is intended?
Yes.
> 5. The room used for displaying the line-diff is too small for my
> font (see attached JPG). There are one or two lines missing on each
> line (the j's, p's, g's etc. are cut off).
> I'm using Lucida Console 9 pt. (all pt sizes have the same problem).
> Courier New displays OK, but I suspect the font definition of courier
> to have the font slightly higher in the available space, so the cutoff
> is there, but only whitespace is being cut off. The size in pixels is
> 10 per line in the line-diff window, and the two panes have 12 pixels
> per line.
The size of that linediff bar is calculated according to the font specs.
Seems the font sizes aren't really correct, i.e. they don't take chars
into account which go below the actual line...
Stefan
--
___
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 Mar 15 15:01:39 2005