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

[TSVN] Unexpected changes when using TMerge

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-11-30 15:24:58 CET

Using TMerge in 2 pane view. Build 2000.

Problem 1:
In TMerge, diff an old revision with the working copy, where there are
several changes scattered through the file.

Select a changed line in left (old rev) pane.
Scroll down so that line is out of sight and you are now looking at a
different changed line.
Right click on that line in the left pane and select "Use text block
from here".
Nothing happens ... maybe I missed ... try again

Well of course something did happen, I just couldn't see it. The
selected line (which is now out of sight) has been changed to the old
version. The line I right clicked on was not selected, so nothing
happened there.

The context menu should only appear when the line right-clicked on is
included in the selection. Or maybe it should still appear, but with
only the "Use this whole file" entry and not the "Use text block..."
entry.

Problem 2:
Diff an old revision with WC.
Select a line in right pane, right click and select "Use text block from
here".
The line from the left pane is used, which is not what I expect.

In fact, in this situation, I do not need the context menu in the right
pane. The right pane is also the output, so everything shown in that
pane is already in the output.

Problem 3:
Diff 2 old revisions.
Now there is no output file but the context menus are still there, and
they still change the pane content. I guess the output gets thrown away
anyway, although I haven't checked.

Problem 4 (enhancement request):
Diff old rev with WC.
Use text block from old rev.
Oops, I didn't mean that line ... undo
But the undo command is disabled in 2 way diff.
Is that easy to add?

Simon

-- 
       ___
  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 Nov 30 15:24:53 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.