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

Re: TSVN merge report inconsistent to svn merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 14 Jul 2008 18:15:59 +0200

John Williams wrote:
>>> Yes the merge results are the same - including the mergeinfo
>>> property. Just to make sure I created a test repository, whch I made
>>> a backup of. I then performed the same test as earlier with TSVN with
>>> the same results as the original post. Then I deleted the repository
>>> (and working copies) and restored the backup repository, check-out
>>> branch and trunk, finally I performed the same test with svn - same
>>> results as original post.
>>
>>> FYI, if it helps, the mergeinfo property for test15-trunk after the
>>> merge is: /branches/1.x:5-6 /trunk:2-4
>>
>>
>>
>> If this is only a test repository, can you dump/zip it and send it to
>> me? And I would also need to know what folder you checked out and
>> which one you tried to merge. Maybe I can reproduce this and find out
>> why the output is different.
>
> Sure, it's a very simple test repository. I have dumped, zipped and
> attached it. To reproduce, checkout trunk and then merge branches/1.x.

Thanks!
Fixed in r13475, backported to 1.5.x in r13476.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-14 18:16:40 CEST

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