[Checkins] [zopefoundation/ZODB] b74eef: Call _p_resolveConflict() even if a conflicting ch...
GitHub
noreply at github.com
Fri Sep 9 15:40:28 CEST 2016
Branch: refs/heads/4
Home: https://github.com/zopefoundation/ZODB
Commit: b74eef767952daf6b972511e9bba389be00955be
https://github.com/zopefoundation/ZODB/commit/b74eef767952daf6b972511e9bba389be00955be
Author: Julien Muchembled <jm at nexedi.com>
Date: 2016-08-21 (Sun, 21 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.
Commit: 7d436f396f8382f1e5fc0c5633478e1860d4a1e6
https://github.com/zopefoundation/ZODB/commit/7d436f396f8382f1e5fc0c5633478e1860d4a1e6
Author: Julien Muchembled <jm at nexedi.com>
Date: 2016-08-21 (Sun, 21 Aug 2016)
Changed paths:
M CHANGES.rst
Log Message:
-----------
Changelog for PR #98
Commit: 27f3a1733fe7ba0626f53252a59fda9e0a55f030
https://github.com/zopefoundation/ZODB/commit/27f3a1733fe7ba0626f53252a59fda9e0a55f030
Author: Jim Fulton <jim at jimfulton.info>
Date: 2016-09-09 (Fri, 09 Sep 2016)
Changed paths:
M CHANGES.rst
M src/ZODB/ConflictResolution.py
M src/ZODB/tests/testconflictresolution.py
Log Message:
-----------
Merge pull request #98 from zopefoundation/issue97
Call _p_resolveConflict() even if a conflicting change doesn't change the state
Compare: https://github.com/zopefoundation/ZODB/compare/b53c7019aeff...27f3a1733fe7
More information about the checkins
mailing list