Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to firstname.lastname@example.org.
Jyothi wrote: > This is the situation: I have some code in the main trunk. I forked a new > branch (lets call it STB_BR) from the main trunk. Currently, the code on > the branch is exactly same as the main branch as there has been no > development after branching (given a file, the revision is same on both > the branches). I would like to lock the files in the STB_BR branch and > allow developers to change files in the main trunk. When I try to lock > the STB_BR branch, it lock the latest version of all the files in the > branch. But the problem is, since it is locking a version of the file > (and not a file in a branch) and this version of the file is the latest > version on the main trunk too, it has essentially locked the file on the > main trunk too. Is there a way to avoid this scenario. Though the same > version of a file is present on two branches, i would like to lock the > file in one branch and not on the other. > > The command I used to lock the branch is "cvs admin -lSTB_BR" Try using ACLs to prevent commits to the branch, rather than locking the branch revisions. Locking is deprecated anyway <http://www.cvsnt.org/manual/html/admin.html> (not depreciated, as it says there -- or maybe it's both :) <http://www.cvsnt.org/manual/html/Security.html> <http://www.cvsnt.org/manual/html/Setting-permissions.html> <http://www.cvsnt.org/manual/html/chacl.html> <http://www.cvsnt.org/manual/html/lsacl.html> (If you really want to lock rather than use ACLs, I suppose you could force a commit on the branch without changing anything. That would create a new revision that is only on the branch, and then locking the branch would not lock the HEAD.) Gerhard