I am not against this model... (it is VERY close to how we do things with MOOSE... and our "stable merge" is automated by Bitten) however, can we have a small "cooling off" period for a moment while everyone gets up to date with using the new build system and pulling from Git?  MOOSE still doesn't even work with the new build system yet (John is getting close).

At the very least, I don't think we should move to a separate branch from master with "stable merging" until we have a public BuildBot up and running that is tracking libMesh development.  I would rather not have individuals making decisions about when to merge to stable without being backed by some automated system telling them that the current stuff is good.

Let's just move to Git and work in master for a little while and let everyone catch their breath...


On Wed, Dec 12, 2012 at 9:32 AM, Kirk, Benjamin (JSC-EG311) <benjamin.kirk-1@nasa.gov> wrote:
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.


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...


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
Libmesh-devel mailing list