[Checkins] [zopefoundation/ZODB] afde0b: DemoStorage: add support for conflict resolution

[GitHub]

  Branch: refs/heads/ds-conflict-history
  Home:   https://github.com/zopefoundation/ZODB
  Commit: afde0b8fb3fb052105b21468ff77599bc0dd7efe
      https://github.com/zopefoundation/ZODB/commit/afde0b8fb3fb052105b21468ff77599bc0dd7efe
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-05-04 (Wed, 04 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: 63cb825dd76fbad17bb5d1ca0abca8e213ce3e60
      https://github.com/zopefoundation/ZODB/commit/63cb825dd76fbad17bb5d1ca0abca8e213ce3e60
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-05-05 (Thu, 05 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/afde0b8fb3fb^...63cb825dd76f