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

Re: What is Tortoise Doing?

From: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Wed, 9 Jun 2010 08:57:32 +0200

>> When I check the log, right-click on an older revision and select
>> 'Compare with working copy', TortoiseMerge gets launched (despite the
>> fact that I've set an external diff/merge viewer).
> It creates a unified diff between the revision and the working copy.
> That's basically a patch file.
> That patch file is then passed to TMerge to apply the patch in reverse
> to the wc.
> Since TMerge is the only UI app (that I know of) that can apply patches,
> it is used exclusively for this.

Wouldn't it be possible to apply the merge to a temporary file and then pass that temporary file(s) to the external diff/merge viewer?
 
Hans-Emil

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2618721

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-09 08:57:44 CEST

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.