Branching Strategy
We are using TFS.
We have two branches, Dev and QA.
Two TeamCity sub projects one per Branch.
The TeamCity settings are stored under the branch.
At sprint end we delete the QA branch and re-branch from the Dev branch to create a new QA branch.
Now when I branch the TC settings are brought over from Dev.
Which in some ways is good as I want any updated steps to be copied from Dev to Qa.
But as its a carbon copy of the branch then some obvious things like VCS settings, build config names, dependencies all become a problem.
I see a document based on branching, but it doesn't cover TFS:
https://confluence.jetbrains.com/display/TCD10/Working+with+Feature+Branches
Has anyone else come up with an alternative solution to branching with TFS ?
Please sign in to leave a comment.
Hi Jon,
A typical approach here would be to parametrize the configuration you need to differ between QA and Dev but to stay the same always in new revisions of QA/Dev, then set those parameters at the branch-project level. Dependencies might be harder to pull, though.
You might want to check storing settings in version control: https://confluence.jetbrains.com/display/TCD10/Storing+Project+Settings+in+Version+Control
This would allow you to easily script your way through it, particularly if using kotlin.