Best Practices question on branches (product versions)

[rgrimard]

I've ready your best practices for managing branches: http://support.sourcegear.com/viewtopic.php?t=193

I'm wondering if I should use the same branching strategy for the following scenario:

1.0 shipped. 1.0 is now it's own branch. 1.0 MR1 development moves to the 1.0 branch. I now have a team of developers working on 1.1 and a team of developers working on 2.0.

At this point, I have developers working on 1.0 MR1, 1.1, and 2.0.

What branching strategy do you suggest for this type of development? My guess would be the trunk is always the "future" stuff. Therefore, my branches would consist of 1.0 (for maintenance releases) 1.1. My trunk would be for 2.0 development. Merges from 1.0 and 1.1 branches would have to occur periodically.

Please confirm.

Thanks
Ryan

[Beth]

You're right. I'm assuming that your 2.0 crew will be working on entirely different things than the 1.1 crew. You would want 1.1 to be it's own branch so your 2.0 work doesn't end up in 1.1. Then merge your 1.1 work in.