Re: What is Tortoise Doing?

On 08.06.2010 10:03, Ashvin Narayanan wrote:
> Hi there,
>
> I am using TortoiseSVN 1.6.7, Build 18415.
>
> 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.
A normal diff/merge viewer simply can't apply patches, that's why your
custom one isn't used.

> Moreover, all three panels in TortoiseMerge contain exactly the same
> text even though my working copy is different.

make sure the 'ignore whitespaces' options are set so they don't ignore
anything.

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=2618522
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].