Re: Query regarding Branches in CVS

[Jenn Vesperman]

On Sat, 2003-04-05 at 01:20, Amit Sood wrote:
> Hi all,
> 
> I have one query regarding the working of CVS
> 
> I am using CVS to maintain my project files and have released one version of
> it.I have made a branch of the target at this juncture with tag RELBRANCH1
> Now simulatneous development is going on parallely on main branch and this
> RELBRANCH1.
> 
> Now if I have one file "ABC.txt" present in both branches,can I lock this
> file
> seperately for both the branches.This means if I have locked for main branch
> it is still unlocked for RELBRANCH1 and other way around.

Do you mean 'locked with cvs admin -l' or locked as in marked for
editing with 'cvs edit', or locked in some other way?

As I understand it, cvs admin -l locks a specific revision. cvs edit
marks the file for editing, but I believe it will mark each branch
separately.

> Also if two users make changes to "ABC.txt" one user make changes to
> "ABC.txt"
> in main branch and other in RELBRANCH1 and these changes at exactly same
> moment of
> time will CVS will be able to handle such a scenario successfully.

Yes. That's what branches are for. The changes in the branch version of
the file will be saved to the branch, the changes in the main version
will be saved to the main trunk. 


Jenn V.
-- 
    "Do you ever wonder if there's a whole section of geek culture 
                you miss out on by being a geek?" - Dancer.
 My book 'Essential CVS' will be published by O'Reilly in 2003.
address@hidden     http://anthill.echidna.id.au/~jenn/