[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-07-31 18:34:13 CEST

Alexander Klenin wrote:
> In a nightly build 10270, while analyzing WC changes with TortoiseMerge,
> I selected 'Use this text block' on a block marked as deleted in
> single-pane view.
> TortoiseMerge crashed, crash report is sent separately to a
> corresponding address.
> However, I seem to remember that previously this menu item was only
> available in a double-pane view. If so, please do not fix this crash
> by disabling it again, but instead by making it work ;-)
> I almost always view differences in a single-pane mode due to
> increased horizontal space it provides, and have often regretted that
> part of the functionality is unavailable in this mode.
> Also, please consider adding in-line differences in single-pane mode as well.

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.

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.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 31 18:32:47 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.