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

Re: Bug with TortoiseMerge?

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Thu, 10 Jun 2010 17:11:52 +0100

On 10 June 2010 16:44, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 10.06.2010 01:58, Ashvin Narayanan wrote:
>> Hi there,
>>
>> When I do a 'show log' on a folder and then select 'compare with
>> working copy' on an older revision, TortoiseMerge gets launched with
>> all three panes showing the exact same data, even though my working
>> copy differs from the revision I'm comparing with.
>
> First, this compares to the working BASE, without your local modifications.
>
> And if TMerge opens with the three pane view, there's somewhere a
> conflict. But it might not show up if you have whitespaces ignored.

Huh? That's not what it does here.
Right click on a folder with local mods
Select last committed rev in top pane and compare with working copy.
TMerge opens with a patch window listing the changed files.
Double click on a file shows the local changes compared with the repo
copy (in this case, the same as BASE).
It works the same way with older revisions, comparing against my
modified WC files, which is exactly what I expect.

And there are 3 panes: Theirs, Mine and Merged. No conflicts expected
and none shown.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2619284
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-10 18:12:04 CEST

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