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

Re: Patching in TMerge

From: Tobias Schäfer <tobiasschaefer_at_gmx.de>
Date: 2006-03-19 22:33:49 CET

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.

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

Tobias

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Mar 19 22:34:16 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.