2016-09-07 5:17 GMT+02:00 Joel Bruick: > This is the right fix. It ensures that each commit is only added to the > queue by the recursive SELECT once instead of an exponential number of times > based on how many merge commits it finds along the way, which is what caused > your problem. I don't know why I used UNION ALL there, but it's definitely > wrong.
Well, I noticed the lock-up as well, some weeks ago but didn't bother to dig into it because I could do what I wanted to do by merging the other way. Glad that it's fixed now! Thanks! Would this be enough reason to do a quick 1.35.1 release? Two regressions are already found plaguing 1.35 for situations which worked fine in 1.34. Branch "branch-1.35" is ready, the only thing missing there is updating changelog.wiki. Regards, Jan Nijtmans _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users