Is it OK to update the ZODB dependency in RelStorage for 1.7.0? Currently it's at ZODB3 >= 3.7.0 (!), but tests are broken when 4.3.0 is used, and PyPy support needs at least 4.2.0. These can be worked around in various ways, but it's nicer to update the dep

I do not know an easier way. I've never actually "reverted" something in git that had commits on top of it (other than manually), even if they don't conflict, so that would be new to me. I'd be happy to take a crack at it and learn though

Yes, the 'doctest' thing for one. If you want to go ahead and merge it, I'm working on a PR anyway to fix the remaining tests (that were still failing) and I can roll re-fixing doctest, etc, in to that