Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DemoStorage: add support for conflict resolution and fix history() #58

Merged
merged 3 commits into from
May 12, 2016

Conversation

jmuchemb
Copy link
Member

@jmuchemb jmuchemb commented May 5, 2016

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).

- It failed with oids that already exist in the base storage.
- MappingStorage returned timestamps in wrong format.
@jmuchemb
Copy link
Member Author

jmuchemb commented May 9, 2016

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.
I also pushed a third commit to update the changelog.
Now, I think it's ready to be merged.

@jmuchemb jmuchemb merged commit 82b3c0f into master May 12, 2016
@jmuchemb jmuchemb deleted the ds-conflict-history branch May 12, 2016 11:54
@jimfulton
Copy link
Member

Please don't merge your own PRs unless someone else has approved them.

@jmuchemb
Copy link
Member Author

jmuchemb commented May 12, 2016

Actually, I planned to wait a few more days, but I forgot to switch to origin/master before committing a trivial change.
OK, that's clear now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants