[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 10 Jun 2010 17:44:34 +0200

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.

Stefan

-- 
        ___
   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=2619275
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-10 17:44:53 CEST

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