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

Re: Diff with URL: tortoiseMerge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 30 Sep 2009 20:49:57 +0200

On 30.09.2009 17:34, Christophe R wrote:
>> If you get the three pane view in TMerge, that means that the file in
>> the repository (the url you chose to compare with) isn't the same as the
>> unmodified file in your working copy.
>>
>> I just tried this with a file in the TSVN working copy: it shows the
>> proper two-way diff since I know it hasn't changed in the repository.
>> I only get a three-way diff if I use my test repo and make sure that the
>> url I diff with has one (or more) revs added than the file in my working
>> copy (and the local file has modifications).
>>
>> Stefan
>
> Thank you Stefan, and sorry for my late answer.
> My WC points to a branch, and my WC is up to date, and I still see the three
> way diff. Could this be explained by the fact that the files have not
> changed since the branch was created? (before I made my local changes to
> those files, their content was the same everywhere: trunk, branch, WC).

Are you entering the url of your branch?
The diff is done between the file in the working copy and the file the
url you entered points to.
Are you sure you're using "diff with url"? Because that command really
should only show a diff between two files and not three.

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=2402237
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-30 20:50:04 CEST

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