Linus Torvalds baeb0ba280 Merge extra_data list when merging two dives of the same dive computer
When merging two dives into a longer one, merge the dive computer
extra_data list too.

We just pick all the extra-data (but avoid entirely duplicate key/value
entries).

Note that this can cause confusing extra-data, in that both dives migth
have things like "battery percentage at beginning/end of dive" keys, and
if the values are different, you'll now get *both* of those values, but
that's better than randomly just taking one of them.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-04-07 20:11:32 +02:00
..
2019-04-04 09:33:56 -07:00
2019-03-17 15:11:31 -07:00
2018-07-18 02:09:15 +03:00
2019-03-17 15:11:31 -07:00
2019-03-17 15:11:31 -07:00
2018-01-31 14:47:26 +01:00
2017-04-29 13:32:55 -07:00
2018-08-23 05:16:38 -07:00
2018-10-21 19:55:09 +03:00
2018-10-21 19:55:09 +03:00
2018-10-21 19:55:09 +03:00
2019-04-02 07:47:11 -07:00
2018-08-23 05:16:38 -07:00
2019-02-05 14:18:14 +01:00
2019-01-22 11:14:03 +13:00
2019-01-09 20:58:04 -08:00
2017-04-29 13:32:55 -07:00
2019-04-04 09:33:56 -07:00
2019-04-04 09:33:56 -07:00
2018-05-30 21:47:07 -07:00
2017-04-29 13:32:55 -07:00
2017-04-29 13:32:55 -07:00
2018-10-21 19:55:09 +03:00
2019-01-16 02:38:30 +01:00