← Back to team overview

fenics team mailing list archive

Re: Repositories and workflow

 

On 23 April 2013 22:10, Johan Hake <hake.dev@xxxxxxxxx> wrote:
> How do we think about small 1 commit fixes? Should these first be pushed
> to next?

I think 'next' might be overkill for this. What about a 'fix' branch,
merge into master and delete the 'fix' branch?

> Do we have a buildbot testing the next branch?
>

If we have the resources, it would be good to test both master and
next, with the intention that master is almost always green, and next
we try to keep green but not minding if it sometimes fails.

Garth

> Johan
>
> On 04/23/2013 10:06 PM, Anders Logg wrote:
>> Dear all,
>>
>> A couple of developers told me last week they were waiting for the
>> dust to settle before jumping in and working actively with the new
>> code repositories. I think the dust has now settled (with yet another
>> rewrite of the FFC repository yesterday) and it's safe to jump in.
>>
>> As before, please read up on
>>
>>    http://git-scm.com/book
>>    https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html
>>    https://bitbucket.org/petsc/petsc/wiki/developer-instructions-git
>>
>> One thing I would suggest now is that core developers publish branches
>> they intend to merge as part of the main repositories (as opposed to
>> storing them in personal repositories). It makes it easier for others
>> to follow the development. Note e.g. that PETSc has 66 branches at the
>> moment. Examples would be the UFL repository which could have the
>> following branches:
>>
>>   master
>>   next
>>   martinal/subdomains
>>   martinal/signatureopt
>>   logg/tuplenotation ;-)
>>
>> Issues we still need to discuss (please jump in) are:
>>
>> - Moving questions to stackexchange (comment on previously suggested
>>   instructions)
>>
>> - Updating the information on the web pages (please help out)
>>
>> --
>> Anders
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~fenics
>> Post to     : fenics@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~fenics
>> More help   : https://help.launchpad.net/ListHelp
>>
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~fenics
> Post to     : fenics@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~fenics
> More help   : https://help.launchpad.net/ListHelp


Follow ups

References