[Subsurface-divelog/subsurface] Merged dives lose gas changes (#364)

[Linus Torvalds]

On Sat, Apr 29, 2017 at 4:09 PM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
>
> I think that needs to be reverted, but I'll look at this a bit more.
> Maybe I can just fix it up.

Ok, this should fix it up. It makes Jan's test work for me.

Dirk, I'm attaching it as a patch because my tree has other patches in
it due to my BLE experiments, so I don't have a nice branch that I'd
ask you to merge on github. I can do that if you wish, but if you
still take patches this is better.

                Linus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Fix-event-merging-when-interleaving-dives.patch
Type: text/x-patch
Size: 2424 bytes
Desc: not available
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20170429/24a6cac4/attachment.bin>