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

Re: [TSVN] Re: Unexpected changes when using TMerge

From: SteveKing <stefankueng_at_gmail.com>
Date: 2004-12-01 10:22:29 CET

On Wed, 1 Dec 2004 08:47:58 -0000, Simon Large <slarge@blazepoint.co.uk> wrote:
> >> 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.

Fixed in revision 2014.

> 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.

I think I finally get what you mean here. Sorry, but sometimes I'm
veeery slow...
The wording of the context menu entry is misleading (because it's the
same as used in the left view). The text shouldn't read "here" but
"there", "left view" or whatever.

Fixed in revision 2015.

> >> 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.

Now I remember: I added the UNDO button/menu entry because I planned
to implement some kind of UNDO. But then I didn't and the button is
still there...


  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 10:23:09 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.