diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-06 11:29:42 -1000 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2019-04-07 20:11:32 +0200 |
| commit | baeb0ba28029d1e9b348ac3933eaedecf3e15e81 (patch) | |
| tree | ab654369e576d409a8350152f48971eb89c7008e /tests/testprofile.cpp | |
| parent | 3184830f513f7928f3d97cfb14b810d80c3bceb4 (diff) | |
| download | subsurface-baeb0ba28029d1e9b348ac3933eaedecf3e15e81.tar.gz | |
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>
Diffstat (limited to 'tests/testprofile.cpp')
0 files changed, 0 insertions, 0 deletions