Re: Diff with URL: tortoiseMerge

On Wed, Dec 2, 2009 at 19:41, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> 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...

So the reason for this behavior is that the patch file that gets
generated shows the diff between your wc of the branch with the trunk
url. Since you've modified the files on your branch already, the patch
doesn't apply anymore. And that's because the diff that svn produces
here is backwards. I've reported this several times already but with
the complete rewrite of the diffing engine on the svn trunk I doubt
that this will get ever fixed on the 1.6.x branch.

Sorry.

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