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

[TSVN] Re: Unexpected changes when using TMerge

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-12-01 09:47:58 CET

SteveKing wrote:
> Simon Large wrote:
>> Using TMerge in 2 pane view. Build 2000.
>> Problem 1:
>> 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.
> Hmmm - didn't we once have the feature that a right-click would select
> the diffed lines? I think it was you who wanted that changed ;)

Not me (I don't think so anyway). I did comment that it is not very
obvious what will get selected when you right click on a block. And I
also asked for "next difference" not to change colouring by selecting,
but you fixed that as better way anyway.

> Well, I guess we just shouldn't show the context menu in that case...

>> 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.
> What do you mean with "in the output"? The right pane (AFAIK) shows
> you the working copy while the left view shows the old revision.

OK, but the any changes made will be saved to the working copy, no?

> Now, sometimes I want to have changes I made 'reverted' so I choose
> the ones from the old file. And that's why the menu is there in the
> right pane. Or did I get you wrong here?

Let me try to illustrate this

Revision 123 Working copy

  int tom; int tom;
  int dick; int dick;
- char *ver = "1.0"; + char *ver = "1.1";
  int harry; int harry;

I have updated the version from 1.0 in rev 123 to 1.1 in my WC.
If I want to revert that to 1.0 then I right click on rev 123 and "Use
text block from here".

But if I right click on the same line in the WC, it also picks up the
line from rev 123 and puts it in the WC. That is not intuitive because I
am not getting a block from "here" where the mouse is.

So if I right click on that line in the WC and choose "Use ... from
here", what should I get? When I save the changes, the result will be my
working copy, with a few changed lines I reverted from rev 123. By
default everything already comes from the right pane.

I suppose ideally we would have a separate "output" pane (like the
merged pane) so you can select the V1.0 line from rev 123, then go back
and select the V1.1 line from the WC. But that would lose the line diff
pane which is more useful, so I am not recommending that change.

>> 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.
> It doesn't get thrown away. If you press "save", then the "save as..."
> dialog comes up where you can save the modified file. Sometimes even
> that is useful.

That's OK then.

>> 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?
> I have to check that first before I can tell you how long it takes to
> implement that.

That is just a "would be nice to have" feature. I only mention it
because Undo appears in the menu but it doesn't work here. No urgency.


  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 Wed Dec 1 09:58:50 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.