On Wed, Apr 1, 2020 at 8:35 PM Thomas Passin <[email protected]> wrote:
Edward, if you retrieved this file before about 9:30 PM Eastern, please get > it again. I found a bug where the line h = c.hash() in store_layout had > been removed during my merge. It needs to be there. > Thomas, I have just *hand copied* your latest version into devel. I did this because approving your PR generated merge conflicts, so we would have been right back where we started from! The checkin log: QQQ Copy 586120f... to vr3.py by hand. https://github.com/leo-editor/leo-editor/commit/586120f8add84a21de43b5713e4165be7c1633ca QQQ I'm pretty sure the code in devel is what you want. It includes the line `h = c.hash()` in store_layout. All unit tests pass and pylint is happy. *Going forward* I don't know why your recent PR's generated so many conflicts. I would like to make that moot. I am not going to touch vr3.py in any way. Feel free to work directly in devel, or on a public branch based on devel. Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/CAMF8tS3bX2VhAdFr4OLfMciADQK%3DuDDaaZgqbbwcUXT7EFSgFg%40mail.gmail.com.
