[Checkins] [zopefoundation/ZODB] d931dc: Call _p_resolveConflict() even if a conflicting ch...

[GitHub]

  Branch: refs/heads/issue97
  Home:   https://github.com/zopefoundation/ZODB
  Commit: d931dc92a3143f243e203e3048181839594c5ab5
      https://github.com/zopefoundation/ZODB/commit/d931dc92a3143f243e203e3048181839594c5ab5
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

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

  Log Message:
  -----------
  Call _p_resolveConflict() even if a conflicting change doesn't change the state

This reverts to the behaviour of 3.10.3 and older.