new "devel" branch in clawpack/clawpack

[Aron Ahmadia]

All, 

I've pushed a new branch named 'devel' to top-level clawpack/clawpack.

I'd like to use this branch for unstable development, that is, to keep track of integrated but untested changes between all four repositories, as opposed to bumps to clawpack/clawpack's master branch, which we have been reserving for stable and tested development.

For those of you familiar with gitflow, you'll recognize this additional branch as part of the standard setup: http://nvie.com/posts/a-successful-git-branching-model/

This shouldn't affect anybody's workflow, but if you have recently merged something into the master branch of one of the sub-repositories, feel free to bump 'devel' as well, regardless of whether you've tested cross-repository integration.  

I would also encourage more forking/branching of clawpack/clawpack (either the devel or master branch), as it allows you to specify complete setups for very adventurous code which can be installed with a single install command.  I've had good luck in the past with this for both the peanoclaw and cudaclaw codes.  Let me know if you need more details on any of this.

Cheers,

Aron

[Aron Ahmadia]

Jed also mentions gitworkflows(7) as an alternative model to keep in mind for development from gitflow: https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html

The main differences between the two are in the integration strategies.  Since we've pretty shamelessly been committing bugfixes and development into master on the subrepositories, this is a bit irrelevant, although we'll have to at some point improve our habits in the future if we'd like pyclaw to be downstreamed into larger packages like anaconda, EPD, or Linux distributions like Ubuntu.

A