svn - Has this branching strategy sense in a web development ecosystem? -


i don't know if question stack-overflow related or should posted on stack-exchange platform, anyway..

the problem new branching system have in mind adopt in near future. @ work develop primarly web applications (ecommerce, cms, classified, special purpose) , websites in php , our vcs svn.

this new model want adopt:

trunk: development

staging (branch): branch created test new features on remote ambient (the same system live has, same server..)

live (branch): branch live.

other branches develop concurrent features.

now, idea bugfix live , push changes trunk. develop features directly on trunk or branches merge trunk.

push trunk staging ready new features go live soon; , then? how can staging live branch? have pass trunk?

now strategy is:

trunk : it's live version

branch each feature

live bugfix done trunk pushed branches

staging working copy switchs branch @ end of development of feature, before merge trunk.

but method has drawbacks:

  • always switching..

  • no possibility test 2 concurrent branches

what think new strategy?

we have branches/feature large feature development, releases/x.y live releases (essentially tags, because more 1 release live concurrently) , trunk used staging release. bug fixes made on trunk , selectively pushed branches or release builds necessary.

trunk run on our staging servers (different hardware, internal-only access) , once it's stable we'll tag new release , deploy live hardware.

you don't source control system use, of them have suggested strategy (http://svnbook.red-bean.com/en/1.0/ch05s04.html#svn-ch-5-sect-6.1) example.


Comments

Popular posts from this blog

javascript - Enclosure Memory Copies -

php - Replacing tags in braces, even nested tags, with regex -