[cvsnt] Multiple Trunks - is it possible?
osindgy at gmail.com
Fri Aug 29 08:59:23 BST 2008
Thanks for the explanation,
I have around 1000s of files my repository to its not feasible to manually
change each and every file to get a version. So i have used the touch to
change the whole repository .
Looks OK till now.
As you mentioned i now have to get a version in order for the other branches
to derive from it.. So i have resorted on force commit..
*cvs commit -f -R Product_1_branch*
However i'm getting an error stating "
$ cvs commit -f -R *Product_1_branch*
cvs commit: nothing known about `*Product_1_branch*'
cvs [commit aborted]: correct above errors first!
I have already this branch present. Please suggest.
On Fri, Aug 29, 2008 at 3:29 PM, Luigi D. Sandon <cp at sandon.it> wrote:
> > 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
> not modified it's identical to the trunk file and thereby still revision
> * 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
> alike 18.104.22.168. B has still 1.1, because he branched when the file was
> 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 22.214.171.124.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 126.96.36.199 and
> Luigi D. Sandon
> cvsnt mailing list
> cvsnt at cvsnt.org
More information about the cvsnt