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

Re: segfault when reverse merging in trunk

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 15 Mar 2013 20:29:01 +0100

On 15.03.2013 19:29, Paul Burba wrote:

>> [snip]
>>
>>> C:\SVN\diff-scripts-1.8-dev>svn merge -r24000:23999
>>>
>>> http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts/diff-xls.js
>>> diff-xls.js
>>
>>
>> Argh! I forgot the --ignore-ancestry flag: you have to pass
>> --ignore-ancestry when merging, then it will crash.
>
> That's it! I can replicate. Fixed in r1457046.
>

Thanks! Rebuild with r1457046, fix confirmed.

Stefan 

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
Received on 2013-03-15 20:29:37 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.