We are using Silk Workbench which stores test assets (e.g. Object Map, Visual Scripts, .Net scripts) in a database. This does minimum of source control for assets by numbering versions and provides control for which version is active.
Our application development operates against three parallel branches: A, B, C that merge into regression.
The purpose of this is Emergency fixes, Monthly Maintenance, and big Project Enhancements.
We have been pretending that one size fits all Test Assets are work for all three branches. We have been wearing these rose colored glasses because migrating and merging test assets is difficulty.
The reality is one size often does not support testing efforts in all four branches.
Has anyone found any solutions for managing test assets against a parallel development environment?