Re: [sage-devel] Re: Git best practice

2015-06-25 Thread Jeroen Demeyer
On 2015-06-26 01:51, Simon King wrote: Which of the two approaches ("Keep the critical commits in and perhaps revert them in a later commit" or "Leave the critical commits out and perhaps insert them later") has the least probability of confusing a referee or upsetting the release manager? Do y

[sage-devel] Re: Git best practice

2015-06-25 Thread Simon King
Hi Travis, On 2015-06-25, Travis Scrimshaw wrote: >You could just make 2 branches, one for each of the commits and > cherry-pick commits between the two branches (or just keep a reference to > the commits you don't want). I know that I can do this. I want to know: What should I push to tra

[sage-devel] Re: Git best practice

2015-06-25 Thread Travis Scrimshaw
Hey Simon, You could just make 2 branches, one for each of the commits and cherry-pick commits between the two branches (or just keep a reference to the commits you don't want). Best, Travis On Thursday, June 25, 2015 at 2:07:53 PM UTC-7, Simon King wrote: > > Hi! > > Trac ticket #18758 d

[sage-devel] Git best practice

2015-06-25 Thread Simon King
Hi! Trac ticket #18758 depends on #18756. The former has no branch yet, the latter has a branch, but it is not clear to me whether the last two commits will actually make it into the final version (it is a proof of concept, but one may argue if it is a good idea). So, the question is: What should

Re: [sage-devel] hosting the sage cell server

2015-06-25 Thread William Stein
On Thu, Jun 25, 2015 at 6:18 AM, kcrisman wrote: >> The Sage Foundation is not a legal entity (it is just the name of an >> account at Univ of Washington), so it can't play that role. Univ of >> > > But perhaps there will be such a (non-UW) legal entity at some point in the > near future? I've

Re: [sage-devel] hosting the sage cell server

2015-06-25 Thread kcrisman
> > The Sage Foundation is not a legal entity (it is just the name of an > account at Univ of Washington), so it can't play that role. Univ of > > But perhaps there will be such a (non-UW) legal entity at some point in the near future? -- You received this message because you are subscribed

Re: [sage-devel] hosting the sage cell server

2015-06-25 Thread William Stein
On Thu, Jun 25, 2015 at 1:55 AM, mmarco wrote: > Ok,i talked to the vice-dean of the university, and it can be taken care of. > > So the situation is the following: > > They have a cluster that is not running because som problem with the power > sources, they are woirking on solving it, so at some

Re: [sage-devel] hosting the sage cell server

2015-06-25 Thread mmarco
Ok,i talked to the vice-dean of the university, and it can be taken care of. So the situation is the following: They have a cluster that is not running because som problem with the power sources, they are woirking on solving it, so at some point it will be running. They have agreed to setup som