mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
858d3e2eed
The handling of dive site merging changed and therefore the tests have to be adapted. 1) Dive sites are recognized as identical based on their name. Therefore, give the dive sites that should be merged the same name. 2) The dive site id of the first imported dive is kept. Thus, merge and reverse merge produce two different output files. Create a second file reflecting that fact. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
22 lines
762 B
XML
22 lines
762 B
XML
<divelog program='subsurface' version='3'>
|
|
<settings>
|
|
</settings>
|
|
<divesites>
|
|
<site uuid='15ae02d1' name='Test dive'>
|
|
</site>
|
|
</divesites>
|
|
<dives>
|
|
<dive number='1' tags='test' divesiteid='15ae02d1' date='2015-10-01' time='08:00:25' duration='46:00 min'>
|
|
<cylinder size='11.1 l' workpressure='207.0 bar' description='unknown' />
|
|
<divecomputer model='do not care' date='2015-10-05' time='08:45:25'>
|
|
<depth max='13.716 m' mean='10.595 m' />
|
|
<sample time='0:00 min' depth='0.0 m' />
|
|
<sample time='0:36 min' depth='13.716 m' />
|
|
<sample time='20:00 min' depth='13.716 m' />
|
|
<sample time='42:00 min' depth='4.572 m' />
|
|
<sample time='45:00 min' depth='4.572 m' />
|
|
<sample time='46:00 min' depth='0.0 m' />
|
|
</divecomputer>
|
|
</dive>
|
|
</dives>
|
|
</divelog>
|