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

Re: TMerge editing

From: Alexander Klenin <klenin_at_gmail.com>
Date: 2007-10-27 16:53:56 CEST

On 10/27/07, Simon Large <simon.tortoisesvn@googlemail.com> wrote:

> There is some strange behaviour in TMerge in the latest nightly.

> Insert chars somewhere in the right pane. Use Ctrl-Z to undo, and the
> pane scrolls so that the active line is right at the bottom of the
> screen.

I am looking into these issues now, but they are not very easy to fix.
There are several entangled problems, and I will need Stefan's help to
resolve them.
In particular, Stefan, the bug as cited above is caused by
call in CUndo::Undo function.
I would replace that call by some other, less destructive function
(basically just last
4-5 lines of DocumentUpdated), but the fact that it is a virtual
function worries me.
What was the reason to make it virtual? I can not find any overrides
in inherited classes,
but may be I am not looking good enough?

> Left click on an unmodified line in the right pane. Black frame
> appears. Left click again and the frame goes away. Right click on the
> same line and the context menu is much reduced (use other whole file,
> paste). Left click again so that the frame comes back and right click
> menu is restored to the full set of options.
> Left drag selection with the mouse only works when the frame is not
> shown at the time you start the click and drag.

This surprised me too first time I tried TMerge editing, but I think this
is intentional to allow both line-oriented selection required for context menu
and char-oriented selection for editing.
So before changing that I think a discussion of desired semantics is needed.
Simon, can you perhaps describe proposed semantics?
If/when your proposal will be implemented,
you can copy-paste description into the manual ;-)

Alexander S. Klenin
Insight Experts Ltd.
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Oct 27 16:54:05 2007

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.