Evolution: which Git repository for development (and branching model)?

Hi all,

With the new ambassador-led Evolution 1.0.10 release, it appears the code has been gathered together in yama's Github fork and then applied to the main modxcms/evolution repository. Should future development be done against yama's repository, and the modxcms repository is the token 'core' one, against which PR's should not be opened? I have some fixes I want to contribute - should I fork his or the master modxcms one?

[What gave me this idea? The 1.0.10 RC came from yama's repository not the modxcms one]

Also, which Git branching model is now being used? According to http://rtfm.modx.com/display/community/Community+Contributor%27s+Guide the 'develop' branch will take all changes and then be merged into master, but looking at modxcms/evolution the develop branch hasn't been updated for a long while.

Thanks!

Quote from: pbowyer at Apr 19, 2013, 03:53 AM

I have some fixes I want to contribute - should I fork his or the master modxcms one?

At the moment we pull all against https://github.com/dmi3yy/evolution. You could do that too. And please open a ticket on http://tracker.modx.com
Quote from: pbowyer at Apr 19, 2013, 03:53 AM

Also, which Git branching model is now being used? According to http://rtfm.modx.com/display/community/Community+Contributor%27s+Guide the 'develop' branch will take all changes and then be merged into master, but looking at modxcms/evolution the develop branch hasn't been updated for a long while.

This has to be decided and then cleaned up from Jason.

I'd like to cleanup the Evolution git repository today, removing all branches except master. We can then recreate develop from master and start fresh for 1.1 development. Remember, the develop branch is for feature development, which must increment the minor release, so when develop gets merged into master next, it should be in preparation for a 1.1.0 release. Critical/major bug fixes intended for 1.0.x patch releases should be submitted against master as "hotfix" branches so they can be merged into master AND develop.

Stumbled upon this Git branching model that seems to cover the most cases occuring during developing projects together. Maybe it helps.

Jako, that's the branching model which MODX projects are supposed to use - it used to be in the wiki (can't find it now)

Jako:

This was indeed the inspiration for the current branching model we have in place on Revolution, and I don't see why it wouldn't work for Evolution as well. IMO, creating a branch for each bug or feature being developed, generally targeting master (or a currently identified release branch) with bug fixes and develop with new features, is a simple, flexible, and effective approach which allows those responsible for integration to easily merge/test pull requests and empowers them to make efficient decisions on code releases.

I'll be glad to assist in any way to make this process work for the Evolution team. Just let me know.

It's almost the same model as explained on MODX Community Contributor's Guide, but with a more visual approach.

For the last two releases we did not differentiated between new features and bug fixes and made our pull requests against master and we did not branch for every fix and feature (just a separate commit for each fix/feature). But that could be done for the next release.


[ed. note: Jako last edited this post 13 years, 5 months ago.]

Since Jason thankfully cleaned up the Evolution repository on github all pull requests with the branching model from rtfm should go to modxcms/evolution now with target 'master' for bugfixes and target 'develop' for new features.

For all code contributions a new ticket should be opened on http://tracker.modx.com.

All fixing branches should use the naming conventions on rtfm with bug-1234 for bugfix branches (1234 is the issue number on http://tracker.modx.com/issues).

There is no 'improvement' ticket type possible on tracker at the moment, so a 'task' ticket could be used for small improvements, a 'feature' ticket for new features and a 'refactor' ticket for a complete rewrite of code parts. Is that right?

How often will the bugfix/task pull requests merged? [ed. note: Jako last edited this post 13 years, 5 months ago.]

Quote from: Jako at Apr 22, 2013, 02:22 AM

Since Jason thankfully cleaned up the Evolution repository on github all pull requests with the branching model from rtfm should go to modxcms/evolution now with target 'master' for bugfixes and target 'develop' for new features.

I haven't done it yet, but will now. I am removing all branches except develop and master.

Ups, big sorry. [ed. note: Jako last edited this post 13 years, 5 months ago.]