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

Re: "Use this text block" in single-pane TortoiseMerge

From: Alexander Klenin <klenin_at_gmail.com>
Date: 2007-08-01 04:45:15 CEST

On 8/1/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> You're right, the context menu wasn't available in single-pane mode.
> And I had to deactivate it again (was activated by accident). Because in
> single-pane mode, there's no sure way (at least not with how TMerge is
> built now) to get the 'other' changes from the selected ones. Yes, you
> might think that it's always the change above, but it's not - there are
> special cases where that's not the case and that's why those features
> are not available in single-pane mode.
I am not 100% sure I understand you correctly, but what you describe
seems an argument against 'Use OTHER text block' menu item. Indeed,
upon thinking, this menu item would be pointless in a single-pane
view, since there is no 'other' block interface-wise.
But how about 'Use THIS text block' item?

> The same (well, almost) applies to inline diffs. And inline diffs in
> single pane mode don't make much sense, because if you have a bigger
> diff block (say three lines), then the inline diffs would not 'match' -
> they would be three lines apart and therefore wouldn't be of much use.
> And of course it would be *much* slower to calculate those.
I am not sure I understand this problem too. Perhaps I should go look
at the code...

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 Wed Aug 1 04:43:43 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.