<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body ><br><br><div style="font-size:100%;text-align:left;color:#000000"><div>-------- Original message --------</div><div>From: </div><div>Date:31/08/2015 10:51 AM (GMT+09:30) </div><div>To: 'Subsurface Mailing List' <subsurface@subsurface-divelog.org> </subsurface@subsurface-divelog.org></div><div>Subject: RE: Cloud storage merge, baby steps </div><div><br></div></div><br><br>-----Original Message-----<br>From: subsurface [mailto:subsurface-bounces@subsurface-divelog.org] On <br>Behalf Of Steve<br>Sent: Friday, 28 August 2015 8:57 AM<br>To: 'Subsurface Mailing List' <subsurface@subsurface-divelog.org><br>Subject: RE: Cloud storage merge, baby steps<br><br>-----Original Message-----<br>From: subsurface [mailto:subsurface-bounces@subsurface-divelog.org] On <br>Behalf Of Dirk Hohndel<br>Sent: Wednesday, 26 August 2015 7:14 AM<br>To: Subsurface Mailing List <subsurface@subsurface-divelog.org>; Linus <br>Torvalds <torvalds@linux-foundation.org><br>Subject: Cloud storage merge, baby steps<br><br>I just pushed quite a few commits that implement a brain damaged <br>implementation of git merge - including a few tests that simulated a couple <br>of very simple scenarios that are already supported.<br><br>What would really help right now are two things<br><br>a) code review. My code is wrong. I am absolute certain of that.<br><br>b) testing. This is easy. Two computers. Connect to cloud storage on both.<br>Make random changes here and there and randomly try to save them. Try to <br>break things. And if you do, please post steps to reproduce the breakage.<br><br>Oh, one caveat. So the test uses the ssrftest@hohndel.org account on the <br>cloud backend. I realize that that may not be ideal - multiple people <br>running make test at the same time could lead to fun situations. But I <br>couldn't come up with a different way to do this without requiring every <br>developer to sign up for a separate test account...<br><br>One thing you shouldn't do. Create merge scenarios with your real data.<br>Sure, you /should/ be able to get your current state back from git. But I <br>don't want to find out that it's possible to corrupt the git backend with <br>this and then have people be upset about their data being lost.<br><br>Daily builds (-1498) are up for Windows, Mac and Android and should be ready <br>soon for the support Linux versions.<br><br>/D<br><br><br>Something I noticed when testing and making backups.<br>If I use the cloud storage then save it as a local file, after opening the <br>local file the line breaks in the dive site edit notes field are not <br>retained (v1498 daily on windows 10 64 bit).<br><br><br>FYI The latest 1539 daily fixed the notes when saving from cloud storage to <br>a local file.<div><br></div><div><br>I also now tested going the other way (local to cloud) and found the same <br>issue where the line endings are stripped out.<br><br>Steve<br><br>_______________________________________________<br>subsurface mailing list<br>subsurface@subsurface-divelog.org<br>http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface<br></div></body>