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

RE: TortoiseMerge usability suggestions

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2006-08-31 09:51:09 CEST

Joseph Galbraith wrote:
> Stefan Küng wrote:
>> What would that be useful for? You still need to select the lines in
>> question with the mouse, so a right-click is the way to go anyway.
>> Or do I miss something here?
>
> When you use the accelerators to navigate (next diff, previous
> diff) it highlights the 'current' change, which appears to be
> a selection.

Exactly my thought. The (Shift)-F8 hotkey navigation should select the
current block by default.

> So F7, F7, F7, CTRL+F9, F7, F7 reverts one of the changes
> from the file :-)

And "F8, Ctrl-F9, F8, Ctrl-F10, F8, Ctrl-F10, F8, Ctrl-Shift-F9" would
quickly take me through a conflicted file and allow me to select "their" or
"mine" blocks plus "Theirs" before "Mine" at the end without having to use
the mouse.

This is in fact my most common use case when I have to resolve conflicts.
Seldom single lines from a block, but most of the time entire blocks. If I
want single lines I have to use the mouse (and think thrice) anyway.

Cheers
- Lübbe

--
       ___
  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 Thu Aug 31 09:51:24 2006

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.