Re: What is Tortoise Doing?

On 09.06.2010 08:57, Hans-Emil Skogh wrote:
> >> 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.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2618922
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].