> On Wednesday, October 2, 2013 11:21:01 AM UTC+1, Jeroen Demeyer wrote:
>>
>> Sorry to ask this silly question, but what exactly is the "correct" git
>> master to use?
Not silly at all, it's quite unclear.
> public/sage-git/master is the integration branch, in particular it has
> working doctests and dev scripts.
Is this always the case now? I've had mixed luck (mostly bad) with
this branch always passing doctests.
On Wed, Oct 2, 2013 at 2:20 PM, R. Andrew Ohana <
andrew...@gmail.com> wrote:
> For what its worth, the main reason why the build_system branch hasn't been
> merged into "master" is that it is still up for review -- it is done (unlike
> the development scripts).
I'm not sure I follow this logic. Isn't build_system in
public/sage-git/master? Why can't master contain unreviewed code until
it has become *the* official release branch.
Why not make the
github.com/sagemath/sage/master =
public/sage-git/master = the thing that most people should build off
of (assuming we can keep it stable). We can have
github.com/sagemath/sage/build_system for just the build_system
additions, and
github.com/sagemath/sage/upstream for the raw,
converted sage releases. Then we wouldn't have to even have wikis and
forum threads detailing what one should use (which are usually
consulted only after cloning from master and building fails
miserably).
Of course even better would be to get out of this hybrid development model soon.
- Robert