Using Subversion with an Advertising Model

Question

we are currently using Subversion for version control, but all of the merge work for our releases is done manually. We release it several times a year, so we create a branch for each version. All work from earlier branches should go to later ones. Work on later branches should not turn into earlier ones (this is in our contracts). I believe this is known as an advertising model.

I think that the following diagram best illustrates our desired workflow, when branches are created, when work on a new version begins, and changes that flow from earlier branches to later ones.

|
1
|
| \ |
| \
| 2
3 | 
| \ | | 
4 |
| | \ |
5 | \
| 6 |
| | 7
| \ | \ | |
| | \ | |
8 9 | \
| | | \
| \ | | | 10
x | \ | |
  | | \ | |
  | | |

abcd

• Subversion, ?
• ?
• // ( "a" ) ?
• ? ( create/merge/reintegrate.)

- .

, , . ( , ). .

    a
    |
    1
    |
   b|\ a
    | \ 
    |  2
    3  |
    |  |
    4  |
  b/|c |
  / 5  |
 |  |  6
 7  |  |
 b  c  a

, b ​​ 2 ( a), , , Subversion, . , 6 . , .

Answer 1

, , , , . ( ). CVS- , , SVN "" (.. ).

( ) ( ). , , , . , , () , .

, , , , . , ( ), , . , (. --stop-on-copy ). , , .

SVN " " , ( , ). ( svnmerge ) . , , .

:

• , . , , , , . , , , , SVN SVN.

• . . / (, ).

• . SVN . , , , , , . / . , ///etc.

• " ". , , "" SVN. , , "" , , , .

!

Answer 2

:

. ( )

, ( , "" ), :

. ( )

, , , - . , , .