[Checkins] [zopefoundation/ZODB] f4d99f: Check invalidation in case of conflict resolution

[GitHub]

  Branch: refs/heads/jm-checkResolve
  Home:   https://github.com/zopefoundation/ZODB
  Commit: f4d99fe3e39bd859c0dc55649525e846d6775d05
      https://github.com/zopefoundation/ZODB/commit/f4d99fe3e39bd859c0dc55649525e846d6775d05
  Author: Julien Muchembled <jm at jmuchemb.eu>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M src/ZODB/tests/ConflictResolution.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  Check invalidation in case of conflict resolution