version control - TFS Branching Merging structure multiple releases -

version control - TFS Branching Merging structure multiple releases -

we moving cvs tfs , importing latest release in tfs , supporting older versions in cvs. have read through 75 page tfs version command branching strategies , seems would using "dev , release isolation" strategy...but can't seem image directory tree in source control. boss states should should never developing n main.

i main, dev , rel branches, our release eng says boss asked started branches productx version 10: dev_v10u01, main , rel_v10u01 several products like:

collectionname projecta dev_v10u01 dev_v10u02 main rel_v10u00 rel_v10u01 rel_v10u02 projectb ...

rel_v10u01 has been released customers, , guess current development going on dev_v10u02, not sure why there rel_v10u02 branch since qa has not got build of u02.

to me scheme not seem right. can have 20-30 updates release, not - when start next major release - starts on believe folders should utilized. create sense utilize folders dev, v10 , rel in:

collection: producta dev v10 dev_v10u01 dev_v10u02 main rel v10 rel_v10u01 rel_v10u02

or should like:

collection: producta v10 dev dev_v10u01 dev_v10u02 main rel rel_v10u01 rel_v10u02 v11 dev dev_v11u01 main rel rel_v11u01

i'm confused why have dev , rel of same name? me, think create next rel branch, bug fixes release done on branch, merged main , main dev when update released client.

am missing here?

for typical branching patterns, (most) development should done in dev branches. rel branches used store snapshot of code released. typically shouldn't doing development in release branch.

when updates, i'm going assume mean same thing features. v10 release may have 10 separate features part of it. sounds trying branch feature model (which results in more merging, gives more development isolation , release flexibility), if typically have 10 dev branches (one each feature/update), 10 dev branches merged main, 1 rel branch created main reflects actual code released.

in short, should have 1 rel branch each actual release production.

version-control tfs