*** jamadden has left #zodb | 00:22 | |
*** J1m has quit IRC | 00:45 | |
*** Scott_ has joined #zodb | 06:45 | |
*** Scott_ is now known as Knio | 06:48 | |
*** jensens has joined #zodb | 11:03 | |
*** jmuchemb has joined #zodb | 12:51 | |
*** jmuchemb has quit IRC | 12:53 | |
*** jamadden has joined #zodb | 13:25 | |
*** jmuchemb has joined #zodb | 15:22 | |
*** jensens has quit IRC | 16:33 | |
*** J1m has joined #zodb | 16:58 | |
*** jmuchemb has quit IRC | 17:43 | |
*** J1m has quit IRC | 17:59 | |
*** J1m has joined #zodb | 17:59 | |
*** jmuchemb has joined #zodb | 18:30 | |
*** J1m has quit IRC | 20:23 | |
*** J1m has joined #zodb | 20:24 | |
*** J1m has quit IRC | 20:35 | |
*** J1m has joined #zodb | 20:50 | |
J1m | jmuchemb, hi! | 20:51 |
---|---|---|
jmuchemb | hello | 20:53 |
J1m | 77 has conflicts for some reason. | 20:53 |
J1m | looking... | 20:54 |
J1m | are you done making changes to it? | 20:54 |
jmuchemb | " 77 has conflicts for some reason." > only src/ZODB/interfaces.py | 20:55 |
jmuchemb | "are you done making changes to it?" > yes | 20:55 |
J1m | k, resolving the conflict... | 20:57 |
J1m | when travis is green again, I'll merge and port to master | 20:58 |
J1m | In the mean time, lunch. | 20:59 |
*** J1m has quit IRC | 20:59 | |
*** J1m has joined #zodb | 21:13 | |
jmuchemb | I'm lost with the undo part | 21:21 |
jmuchemb | on the 4.x branch, things look clear (invalidations processed in DB.TransactionalUndo) | 21:22 |
jmuchemb | but on master, I see that UndoAdapterInstance also deals with invalidations | 21:23 |
jmuchemb | I don't understand UndoAdapterInstance | 21:23 |
jmuchemb | never mind | 21:24 |
jmuchemb | (I think I found; all recent changes to TransactionalUndo for #77 have to be moved in UndoAdapterInstance) | 21:26 |
J1m | Yup. I'm working on it, unless you'd rather. | 21:26 |
J1m | OK, I see your note about porting to master. :) | 21:27 |
J1m | I'll stop, but am happy to restart if you wish. | 21:27 |
jmuchemb | I do | 21:30 |
J1m | You wish me to restart? | 21:40 |
jmuchemb | I have a merge commit being tested by travis (branch jm-merge-4): https://github.com/zopefoundation/ZODB/commit/00483fa0b6a8a87c6b8867d45994ce10ad333084 | 21:46 |
J1m | excellent. Thanks. | 21:47 |
jmuchemb | do I open a PR only for this ? or do I also include my next commit to switch all storages to the new API ? | 21:47 |
J1m | Please a PR just for this. | 21:48 |
jmuchemb | #80 (oops, I forgot there were more commits than when I initially worked on this subject: my PR message is a little reductive) | 21:53 |
jmuchemb | handle_serial branch rebased | 21:58 |
J1m | Little reductive? | 22:01 |
jmuchemb | we could have work on the 4.4.2 changelog before merging | 22:08 |
jmuchemb | maybe just: | 22:14 |
jmuchemb | 4.4.2 (unreleased) | 22:14 |
jmuchemb | ================== | 22:14 |
jmuchemb | Better support of the new commit protocol. This fixes issues with blobs and | 22:14 |
jmuchemb | undo. See https://github.com/zopefoundation/ZODB/pull/77 | 22:14 |
jmuchemb | I go home. I'll be available in ~20 minutes | 22:28 |
*** jmuchemb has quit IRC | 22:28 | |
*** jmuchemb has joined #zodb | 22:51 | |
*** J1m has quit IRC | 23:24 | |
*** J1m has joined #zodb | 23:25 |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!