[cvsnt] Multiple Trunks - is it possible?

Luigi D. Sandon cp at sandon.it
Fri Aug 29 08:29:30 BST 2008


> not all the files have sub-version. Because its still the same as the 1.1
> show above.

Did you tried to modify the files on each branch and commit? As long as a 
file is not modified, it retains the revision number from the branch it 
comes from. For example

* trunk has test.c at revision 1.1
* developer A creates branch_A from trunk. He gets test.c, but because it is 
not modified it's identical to the trunk file and thereby  still revision 
1.1
* developer B creates branch_B from branch_A. He gets test_c again but if A 
never modified it, the revision number is still 1.1 - it's the same file on 
the trunk still.
* When A modifies test.c and commits, the revision numnber becomes something 
alike 1.1.2.1. B has still 1.1,  because he branched when the file was still 
at revision 1.1 in branch_A.
* If B modifies test.c on its own branch (or merges changes) and commits, 
the revision number becomes something alike 1.1.2.2.2.1 (I don't exactly 
remeber the algorithm it uses to assign revision numbers, because they are 
internal identifiers I don't care much how they are assigned).

Note also that the revision number can be different, depending on the 
revision number the file had when it was branched. For example if foo.c is 
at revision 1.4 and bar.c is at revision 1.13 when the branch is created, 
when they are modified and commited they become revision 1.4.2.1 and 
1.13.2.1.

-- 
Luigi D. Sandon 




More information about the cvsnt mailing list