Re: [fossil-users] Objections to merging stash-fixes branch?

2016-09-07 Thread Joe Mistachkin
Andy Bradford wrote: > > Any objections to merging the stash-fixes branch? > Andy, FYI, I've modified your branch to re-merge changes from trunk without the changes for OpenSSL 1.1.0, which is not quite ready for primetime yet. Jan, I think the MSVC makefile needs updating for the OpenSSL

[fossil-users] Objections to merging stash-fixes branch?

2016-09-07 Thread Andy Bradford
Hello, Any objections to merging the stash-fixes branch? Basically, by changing the primary key, it is possible to track renames in a stash: http://www.fossil-scm.org/index.html/vdiff?from=b03f15635dd356be=1912b2f864a746bb=1 In addition to creating a new schema for new checkouts, it will

Re: [fossil-users] Infinite loop on merge

2016-09-07 Thread Ross Berteig
On 9/7/2016 1:15 AM, Jan Nijtmans wrote: 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. I built and

Re: [fossil-users] Infinite loop on merge

2016-09-07 Thread Jan Nijtmans
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