Merging data from two DC broken?

[Dirk Hohndel]

On Feb 16, 2013, at 1:28 AM, Dirk Hohndel wrote:

> 
> On Feb 16, 2013, at 1:25 AM, Miika Turkia wrote:
>> File sent directly to Dirk.
>> 
>> I did a bit more testing. If I close the combined XML file where no
>> merging have occurred after download and then open it again - the DCs
>> are merged properly. So the basic merge is functioning properly but it
>> is not triggered when importing/downloading from DC.
> 
> And because of this I can of course not reproduce this here :-(
> 
> I guess I have to go back to my earlier suggestion.
> 
> Run this under gdb. Download from the Stinger.
> Hit Ctrl^C and set a breakpoint in likely_same_dive
> continue
> 
> My hunch is that we are comparing something here that hasn't been run through fixup_dive, yet…

Nope, that's not it. Regardless where the dive comes from, it should be recorded via record_dive() (and then record_dive_to_table()) which runs it through fixup_dive…

I really should go to bed now. I've had two nights on under 4h of sleep already, if I do a third I'll turn into a gnarling monster…

I would appreciate if you could try to debug this. Otherwise I'll get out one of my divecomputers and try to reproduce this over the weekend.

Thanks

/D
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4130 bytes
Desc: not available
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20130216/76fdb55e/attachment.bin>