Re: git: Pulling from master

2017-11-17 Thread Willem Ferguson
>From phone. Thank you everyone. I am finally github - able. Took large chunk of my day but it was worth it. Kind regards, Willem On 17 Nov 2017 17:53, "Dirk Hohndel" wrote: > On Nov 17, 2017, at 7:51 AM, Willem Ferguson < willemfergu...@zoology.up.ac.za> wrote: > > On

Re: Cylinder vs. tank -

2017-11-17 Thread Dirk Hohndel
Consistency. We're not really consistent about that... This really is a question more for documentation and usability people. Replacing the one confusing entry seems like a safe start. /D On November 17, 2017 12:41:45 PM PST, Stefan Fuchs wrote: >Hi Everybody, > >maybe I'm

Re: O2 sensor values on CCR dives

2017-11-17 Thread Davide DB
On 17 November 2017 at 19:10, Anton Lundin wrote: > On 17 November, 2017 - Davide DB wrote: > >> Looking to one of my CCR dives (Petrel 2 controller) I realized that >> Po2 values reported by Subsurface at the 6 meter stop are way higher >> than those recorded and displayed by

Cylinder vs. tank -

2017-11-17 Thread Stefan Fuchs
Hi Everybody, maybe I'm bored (not really!) but I found a really minor item where I would like to ask what we should do: There is one prominent example where we once use "Tank" and once use "cyl." for almost the same thing - add gas change menu entry vs. gas change info box display. I saw that

Re: [Subsurface-divelog/subsurface] Don't show cylinder pressure graph for wrong dc for merged dives (#815)

2017-11-17 Thread Dirk Hohndel
Linus has already responded, but this one is important to me, so I’ll chime in as well… > On Nov 17, 2017, at 11:22 AM, Stefan Fuchs wrote: > > Am 17.11.2017 um 03:05 schrieb Linus Torvalds: >> And I think it merits some cleanup first. >> >> Something like the attached three

Re: [Subsurface-divelog/subsurface] Don't show cylinder pressure graph for wrong dc for merged dives (#815)

2017-11-17 Thread Linus Torvalds
On Fri, Nov 17, 2017 at 11:22 AM, Stefan Fuchs wrote: > > It will still happen regularly that I will be the one who only can either > "complain" about s.th. not working or best case suggest a concept but > someone else has to do the "nice" code. I'm still far away from being a good

Re: [Subsurface-divelog/subsurface] Don't show cylinder pressure graph for wrong dc for merged dives (#815)

2017-11-17 Thread Stefan Fuchs
Am 17.11.2017 um 03:05 schrieb Linus Torvalds: > And I think it merits some cleanup first. > > Something like the attached three patches? > > NOTE! Untested. And it's not smaller than your patch. I just think > it's a bit more explicit about what it does, and thus maybe clearer. > > But I don't

Re: Warning: Major construction work on planner ongoing

2017-11-17 Thread Stefan Fuchs
Am 16.11.2017 um 15:00 schrieb Robert Helling: > But what I already have touches a lot of code in the planner (planner.c > deco.c and also user interface .cpp related to it). So could I please ask you > to hold back working on the planner over the weekend so I don’t run into a > big merge

Re: O2 sensor values on CCR dives

2017-11-17 Thread Anton Lundin
On 17 November, 2017 - Davide DB wrote: > Looking to one of my CCR dives (Petrel 2 controller) I realized that > Po2 values reported by Subsurface at the 6 meter stop are way higher > than those recorded and displayed by Shearwater Desktop. > I'm 100 sure that Shearwater Desktop shows correct

Re: git: Pulling from master

2017-11-17 Thread Dirk Hohndel
> On Nov 17, 2017, at 7:51 AM, Willem Ferguson > wrote: > > On 17/11/2017 17:38, Dirk Hohndel wrote: >> >> And just in case that isn't obvious - there really isn't a huge need to keep >> the 'master' in your fork in sync with upstream. You can always just

Re: git: Pulling from master

2017-11-17 Thread Dirk Hohndel
> On Nov 17, 2017, at 4:32 AM, Willem Ferguson > wrote: > ~/src/$ git clone g...@github.com:Subsurface-divelog/subsurface.git > Cloning into 'subsurface'... > Permission denied (publickey). > fatal: Could not read from remote repository. See my other email -

Re: git: Pulling from master

2017-11-17 Thread Dirk Hohndel
> On Nov 17, 2017, at 2:20 AM, Jan Mulder wrote: > > On 17-11-17 10:59, Willem Ferguson wrote: >> I am sorting out the Github mechanism for myself. >> Two questions: >> 1) The upstream repository. Currently there are two such repositories: >> i)

Re: mobile: android splash screen (and issue 513) opacity weirdness

2017-11-17 Thread Lubomir I. Ivanov
On 17 November 2017 at 10:52, Jan Mulder wrote: > On 16-11-17 23:05, Lubomir I. Ivanov wrote: > >> since ApplicationWindow is first set to "visible = false", and only >> set to "visible = true" on Component.onCompleted(), this might create >> something in those lines. > > >

Re: git: Pulling from master

2017-11-17 Thread Willem Ferguson
On 17/11/2017 12:20, Jan Mulder wrote: And I use a stupid script to get things synced: git checkout master git tag -d continuous # recently added to get the continuous label moved git fetch upstream git merge upstream/master git push origin master # push things to my github account --jan

git: Pulling from master

2017-11-17 Thread Willem Ferguson
I am  sorting out the Github mechanism for myself. Two questions: 1) The upstream repository. Currently there are two such repositories: i) git://subsurface.hohndel.org/subsurface.git  [git has the label "origin"] ii) https://github.com/Subsurface-divelog/subsurface [git has the label

Re: mobile: android splash screen (and issue 513) opacity weirdness

2017-11-17 Thread Jan Mulder
On 16-11-17 23:05, Lubomir I. Ivanov wrote: On 16 November 2017 at 23:06, Jan Mulder wrote: While investigating issue #513 ([Bug] Mobile: Startup splash screens display 2 different background color (Black then White) I found the commit that introduces this splash screen