[TSVN] TMerge doesn't handle "don't expand keywords" well (was Re: "Diff" shows expanded keywords as diffs, ...)

SteveKing <steveking@gmx.ch> writes:

> Eric Hanchrow wrote:
[...]
> > Finally, the bug: I right-click on the file's Explorer icon, and
> > choose "SVN Diff" from the Tortoise menu, but now I see _four_ changed
> > lines: the original comment, which I expected, and one line each for
> > the three expanded keywords, which I didn't expect. Those extra three
> > lines are the bug.
>
> Not a bug!
> Settings->Diff/Merge tab, Advanced button. Then there's a checkbox
> "Don't convert files when diffing against BASE" - uncheck that box if
> you want the keywords to be _not_ expanded when diffing.

Is there a way to handle the following scenario better?
(It seems to be by design, at least for all/other external diff-tools, but as
TMerge is a little bit 'internal' ...)

1) Uncheck "Don't convert files when diffing against BASE" (as above)

2) Diff a file where some keywords _are_ expanded with TMerge (right
   click, choose TSVN diff) in two pane view.

3) Edit File a little bit, save it.

3) Press Reload in TMerge

   Expected: Update of display.

   Experienced: Left side becomes all red (all lines removed), right
                side becomes empty.

This is with TSVN 1.1.2 (I am compiling newer version, atm).

Jens

-- 
Jens.Scheidtmann@bayerbbs.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org