Re: Patching in TMerge

Tobias Schäfer wrote:
> On Wednesday 15 March 2006 23:47, Simon Large wrote:
>> Tobias Schäfer wrote:
>>> I'd prefer to add another bold context menu item. This will make it more
>>> intuitive. I didn't know till right now, that such a feature existed.
>
> Implemented in revision 6050.
> The new context menu item is called "Preview patched file" and is bold like
> all default items.

Great, thanks :-)

>> One other thing while I remember. If you press ESC, the patch list goes
>> away, and there is no way (AFAIK) to get it back again, unless you quit
>> TMerge and start over. Should we be worried about that? Should there be
>> a means of showing/hiding that box instead of just closing it altogether?
>
> You can select "File/Open", choose "Apply unified diff", select the diff file
> and the directory and confirm with "OK".
> Maybe a better solution is to prevent the user from closing that window at
> all. TortoiseMerge could hide that window if the window contains no items.
> IMHO this is only the case if two files are compared directly, i.e. there is
> no patched file involved. I can't think why the user might want to close that
> window.

It is always on top, so it hides part of the diff window.

If I am diffing file:BASE I don't want to see that dialog at all. Only
when patching, or when viewing a set of diffs for more than one file.

Having the defaults like it is now, and a toolbar button or hotkey to
show/hide the file list would be good. Something like a combo box next
to the toolbar could work, although I don't think you can have a context
menu on a standard combo box.

Simon

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