libdivecomputer submodule hoot

[Robert Helling]

Hi,

please excuse my ignorance but I did not really follow the discussion around making libdivecomputer a submodule.

Could somebody please summarise for my what I am supposed to do assuming I don’t touch libdivecomputer code?

Because what happened is that more than once I managed (by doing commit -as) to include chunk from libdivecomputer with some reference to a commit in my own commit (possibly by rebasing what I had onto recent master). I assume I am not supposed to commit that. Do I have to make sure manually not to include it (using git add -p rather than commit -a)? What is the supposed work flow?

Even worse, in my PR https://github.com/Subsurface-divelog/subsurface/pull/1154 <https://github.com/Subsurface-divelog/subsurface/pull/1154> it seems I also have updates to libdivecomputer (unintentionally, didn’t touch). I guess the travis build failures are related to that but also me confusion here prevented me to finally merge this into master so I missed the cut for 4.7.8 (and yes, it introduces a string).

Any advice?

Best
Robert

--
.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oO
Robert C. Helling     Elite Master Course Theoretical and Mathematical Physics
                      Scientific Coordinator
                      Ludwig Maximilians Universitaet Muenchen, Dept. Physik
                      Phone: +49 89 2180-4523  Theresienstr. 39, rm. B339
                      http://www.atdotde.de

Enhance your privacy, use cryptography! My PGP keys have fingerprints
A9D1 A01D 13A5 31FA 6515  BB44 0820 367C 36BC 0C1D    and
DCED 37B6 251C 7861 270D  5613 95C7 9D32 9A8D 9B8F





-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20180405/6335d190/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 235 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20180405/6335d190/attachment.sig>