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

[TSVN] Re: Enhancement request: Editing in TortoiseMerge

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2004-11-24 13:17:32 CET

HI!

"Simon Large" <slarge@blazepoint.co.uk> wrote in message
news:co1jad$9h6$1@sea.gmane.org...
> Thomas Börkel wrote:
> > It would be very nice, if one could change lines while viewing a diff
> > in TortoiseMerge, like it is possible in BeyondCompare.
>
> This was discussed a couple of months ago. Yes it would be nice, but it
> is not going to happen any time soon because it turns TortoiseMerge into
> an editor which brings in a whole lot of new uncertainties and problems
> to fix which are unrelated to revision control. If you like

Maybe retricted editing of one line?

> BeyondCompare, then why don't you use BeyondCompare? You can configure
> TSVN to use a 3rd party diff/merge tool in the settings dialog.

I know. Problem is, you have to be very very careful to not edit the left
part, otherwise you destroy your working base.

And for merge (with conflict), BeyondCompare cannot be used, because it does
not know about conflicts.

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 24 13:18:08 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.