Re: segfault when reverse merging in trunk

2013-03-15 Thread Stefan Küng
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 wil

Re: segfault when reverse merging in trunk

2013-03-15 Thread Paul Burba
On Fri, Mar 15, 2013 at 2:03 PM, Stefan Küng wrote: > On 15.03.2013 18:59, Paul Burba wrote: >> >> On Fri, Mar 15, 2013 at 1:52 PM, Stefan Küng >> wrote: >>> >>> On 15.03.2013 18:46, Paul Burba wrote: On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng wrote: > > > Hi, >

Re: segfault when reverse merging in trunk

2013-03-15 Thread Stefan Küng
On 15.03.2013 18:59, Paul Burba wrote: On Fri, Mar 15, 2013 at 1:52 PM, Stefan Küng wrote: On 15.03.2013 18:46, Paul Burba wrote: On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng wrote: Hi, using a build from todays trunk: $ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scr

Re: segfault when reverse merging in trunk

2013-03-15 Thread Paul Burba
On Fri, Mar 15, 2013 at 1:52 PM, Stefan Küng wrote: > On 15.03.2013 18:46, Paul Burba wrote: >> >> On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng >> wrote: >>> >>> Hi, >>> >>> using a build from todays trunk: >>> >>> $ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts >>> wc >

Re: segfault when reverse merging in trunk

2013-03-15 Thread Stefan Küng
On 15.03.2013 18:46, Paul Burba wrote: On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng wrote: Hi, using a build from todays trunk: $ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts wc $ cd wc $ svn merge -r23995:23994 http://tortoisesvn.googlecode.com/svn/trunk/contrib/di

Re: segfault when reverse merging in trunk

2013-03-15 Thread Paul Burba
On Fri, Mar 15, 2013 at 1:23 PM, Stefan Küng wrote: > Hi, > > using a build from todays trunk: > > $ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts wc > $ cd wc > $ svn merge -r23995:23994 > http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts/diff-doc.js > dif

segfault when reverse merging in trunk

2013-03-15 Thread Stefan Küng
Hi, using a build from todays trunk: $ svn co http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts wc $ cd wc $ svn merge -r23995:23994 http://tortoisesvn.googlecode.com/svn/trunk/contrib/diff-scripts/diff-doc.js diff-doc.js this segfaults in libsvn_client/merge.c, line 7407 beca