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
