DemoStorage: add support for conflict resolution and fix history()#58
Merged
DemoStorage: add support for conflict resolution and fix history()#58
Conversation
- It failed with oids that already exist in the base storage. - MappingStorage returned timestamps in wrong format.
jmuchemb
force-pushed
the
ds-conflict-history
branch
from
e561636 to
f726e40
Compare
Member
Author
|
Oops, I didn't see that Jim released persistent 4.2.0 shortly after my PR was accepted: I've just amended to not disable any test on PyPy. |
Member
|
Please don't merge your own PRs unless someone else has approved them. |
Member
Author
|
Actually, I planned to wait a few more days, but I forgot to switch to origin/master before committing a trivial change. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Due to a bug in the Python implementation of TimeStamp, one of the added tests is disabled for PyPy.
I submitted zopefoundation/persistent#37, so if we do a new release of persistent quickly, we could wait to merge this one (with a bumped dependency in setup.py).