[MOAB-dev] MOAB git branching model

[Jed Brown]

Tim Tautges <tautges at mcs.anl.gov> writes:
> My concern with the petsc workflow is about branch merges to next
> taking awhile to graduate to master.  However, looking over the repo
> structure, it seems like that happens quickly enough in petsc.

It takes as long or as short as needed.  There is a tradeoff between
fast graduation (easy for new development to confidently build on it)
versus stability (only well-tested features make it to master).  Strike
your balance wherever it suits you.

> For releases, do they just get tagged on master, or is there a
>separate release branch?  If the former, do point releases get inserted
>into master as well?

Feature releases are tagged on 'master', at which point 'maint' is
fast-forwarded.  Maintenance releases (bug fixes; no API changes) are
tagged on 'maint'.  Preview releases or RCs would be tagged on 'master',
though we don't currently use those.

> And, does auto testing happen on next?  I'd assume so (and on master too, of course?).

Yes, most auto-testing is directed at 'next', with some on 'master' to
confirm that we didn't mess up.  You can also have CI run on branches
before merging to 'next', but our current testing infrastructure doesn't
handle that case well at the moment.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/moab-dev/attachments/20130919/424cb579/attachment.pgp>