Paprikas, confusion over how to commit and merge to current minor release development branches vs feature branches vs. patch release branches was turning into a problem. 1.0 is trashed and now a dead branch. I merged what I could back from branches/1.0.1, but it’s a mess. New features, non-critical bugs, and improvements should be committed to branches/1.1 now and anything in 1.0 you want to preserve will need to be merged from 1.0 to 1.1 or reapplied to 1.1 directly. Critical bug fixes and security patches should be committed to branches/1.0.x and merged from there to branches/1.1.
I’ve started a
MODx Development space on Confluence to document the branching and merging procedures for Evolution and Revolution. See
http://svn.modxcms.com/docs/display/DEV/Evolution+1.x+SVN for my initial thoughts on Evolution branches going forward. Go ahead and continue to ask questions in this regard and we’ll get this process straightened out.