[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, 02 Dec 2009 19:41:24 +0100

On 01.12.2009 20:10, chroyer wrote:
> Hi,
> A recent post (Re: TSVN - Log Dialog - Compare with Previous Revision) reminded me about an issue I inquired about a while back. I had posted additional info from tigris and got no answer, I suspect the message never made it trough, so here it is again. Sorry for the inconvenience.
>
> Thanks,
> Christophe
>
>> This is what I did to reproduce/isolate the scenario:
>> -create a new repo (with tsvn), with /trunk and /branches
>> -add and commit 2 files to the trunk
>> -branch the trunk to /branches/b1
>> -checkout b1 in wc-b1
>> -edit the 2 files (do not commit)
>> -shift-right click on wc-b1, choose diff with URL. Enter the URL of the trunk
>>
>> tortoiseMerge shows up with a list of 2 files, both in red. Double clicking on any one of them set tortoiseMerge in 3 way pane mode.

Here, for me TMerge shows the list of 2 files but both in black.
Doubleclicking them shows the proper diff.

Tried again, but with different modifications to the two files. And now
I too get the three way view in TMerge and both files showing in red.

I'll do some more investigating...

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=2426435
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-02 19:41:56 CET

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