Re: Cloud storage merge, baby steps

2015-09-09 Thread Dirk Hohndel
On Tue, Sep 08, 2015 at 01:01:12PM +0930, Steve wrote: > > Something I noticed when testing and making backups. > If I use the cloud storage then save it as a local file, after opening the > local file the line breaks in the dive site edit notes field are not retained > (v1498 daily on windows

RE: Cloud storage merge, baby steps

2015-09-07 Thread Steve
-Original Message- From: subsurface [mailto:subsurface-boun...@subsurface-divelog.org] On Behalf Of Steve Sent: Friday, 28 August 2015 8:57 AM To: 'Subsurface Mailing List' <subsurface@subsurface-divelog.org> Subject: RE: Cloud storage merge, baby steps -Original Message

RE: Cloud storage merge, baby steps

2015-09-03 Thread Steve
Original message From: Date:31/08/2015 10:51 AM (GMT+09:30) To: 'Subsurface Mailing List' Subject: RE: Cloud storage merge, baby steps -Original Message- From: subsurface [mailto:subsurface-boun...@subsurface-divelog.org] On Behalf Of Steve Sent: Friday, 28 August

RE: Cloud storage merge, baby steps

2015-08-27 Thread Steve
merge, baby steps I just pushed quite a few commits that implement a brain damaged implementation of git merge - including a few tests that simulated a couple of very simple scenarios that are already supported. What would really help right now are two things a) code review. My code is wrong. I am

Cloud storage merge, baby steps

2015-08-25 Thread Dirk Hohndel
I just pushed quite a few commits that implement a brain damaged implementation of git merge - including a few tests that simulated a couple of very simple scenarios that are already supported. What would really help right now are two things a) code review. My code is wrong. I am absolute