[Checkins] [zopefoundation/ZODB] 9d1362: DemoStorage: add support for conflict resolution
GitHub
noreply at github.com
Mon May 9 19:20:25 CEST 2016
Branch: refs/heads/ds-conflict-history
Home: https://github.com/zopefoundation/ZODB
Commit: 9d13627c1e773ce0caf2d19cf23aa0f826ba2faa
https://github.com/zopefoundation/ZODB/commit/9d13627c1e773ce0caf2d19cf23aa0f826ba2faa
Author: Julien Muchembled <jm at nexedi.com>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/ZODB/ConflictResolution.py
M src/ZODB/DemoStorage.py
M src/ZODB/tests/testDemoStorage.py
Log Message:
-----------
DemoStorage: add support for conflict resolution
Commit: f726e40ac8a85622f8b03d6a672a6ad52ec0b6eb
https://github.com/zopefoundation/ZODB/commit/f726e40ac8a85622f8b03d6a672a6ad52ec0b6eb
Author: Julien Muchembled <jm at nexedi.com>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/ZODB/DemoStorage.py
M src/ZODB/MappingStorage.py
M src/ZODB/tests/HistoryStorage.py
M src/ZODB/tests/testDemoStorage.py
Log Message:
-----------
DemoStorage: fix history()
- It failed with oids that already exist in the base storage.
- MappingStorage returned timestamps in wrong format.
Compare: https://github.com/zopefoundation/ZODB/compare/e561636a9e9b...f726e40ac8a8
More information about the checkins
mailing list