Re: What is Tortoise Doing?

>>>> 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?
> svn has no api to apply a merge to a temp file - only versioned files
> can be the target of a merge.

I guess that this means that the patch is interactively applied? Otherwise we could apply the patch to the file in the wc and then pass that file to the external program. Or am I missing something crucial here?
 
Hans-Emil

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-10 17:15:21 CEST