On Dec 12, 2012, at 9:28 AM, John Peterson <peter...@cfdlab.ae.utexas.edu> wrote:
> The development branch can be periodically merged into stable, perhaps > automatically by buildbot whenever tests pass. > > So core developers would primarily work with the development branch, > and users who lie somewhere between "core developer" and "downloader > of release tarballs" would use the stable branch. I like that model, at least as a point of departure. Would there be consensus then in (1) treating 'master' as the place for stable code, along the lines of Roy's suggestion, (2) creating 'devel' where the core developers live. Follow a nearly-centralized model (for now anyway as we wean from subversion), where anyone can push anything that compiles and passes 'make check' into devel. Most libMesh CI instances would follow devel, to help spot things like compiler compatibility, PETSc backwards compatibility, etc… before syncing to master, and (3) again, per Roy's suggestion, any of the core developers (or buildbot) can sync devel to master whenever it is sufficiently mature and tested. The only additional thing I'd push for is that automatically generated files live only in master. Any core developer working on devel should be sufficiently proficient to make sure they have the autotools and can bootstrap. In this way there is no need to everyone to have identical autotools versions when working on devel, or living with the dreaded -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. noise. Whenever someone merges devel back to master they are responsible for updating the generated files with that commit, but there should be no conflicts. If we can converge on this I'll create a 'devel' branch off master and we can start trying this out... -Ben ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ Libmesh-devel mailing list Libmesh-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/libmesh-devel
