What should be the development of the "trunk" or release

Question

I have an unsuccessful source control ability through Borland StarTeam. Unfortunately, this is very small, and one of the weaknesses is the management of views. I love SVN and come from SVN. Our problem is the release of post-production, in which we spend countless hours replacing changes in the environment of "production support".

Please, do not bother me, it is not my business, I inherited it and try to present the best way to manage the repository. Cannot switch to another SCM tool.

Current setting

• Product.1.0 (TRUNK, current production code and at this level are waiting for bug fixes)
  • Product.2.0 (true trunk checked something in testing, and then the next production cycle is released, there are a lot of changes in this view).

My suggestion is to swap, all development will be performed on the trunk (Production), tag on releases and, if necessary, create child views to provide bug fixes in supporting production.

• Production
  • Production.2.0.SP.1

I cannot find the documentation to support the above suggestion, so I am trying to get feedback on whether the change is a good idea, and if there is something that you would recommend differently.

Answer 1

Here is my general tip for structuring assembly threads:

+HEAD - master -> current development 
+ tags
   + version1 
   + version1.sp1 
   + version1.sp2 
   + version2
+ branches
   + version1.sp2.fixes <- at some point, this will get promoted to version1.sp3 
   + version2.fixes <- at some point, this will get promoted to version2.sp1 
   + version2.nix.feature1 <- this is your (nix's) private version2.feature branch 
   + master.nix.feature2  <- this is your (nix's) private new development feature branch.

, .fixes - .

, .

Answer 2

, " " . :

, , . .

( ). .

( , ) . Mainline - , .

, , :

• - . ?
• ( 1.0, A, B) .

:

_{(: infoq.com)}

, :

• X . , .
• A , .
• A , .
• 2.3 , 2.3 .

, ( ), .

• , , .
• , , .

, . , , , :

• 2.3 .
• .
• , .

:

• - ( )
• ( ), ,
• .

.

Answer 3

. StarTeam, . - ( StarTeam , , ). , , . .

​​ , ( versa , ).

, , , Branch on Change. , , , , , . , .

, -, .