Re: CVS newbie help.

[Sergei Organov]

"Sisyphus" <address@hidden> writes:

> I just started using CVS. I use a remote repository and have checked
> out a project from the main branch ( using CVS_RSH, CVSROOT ....)
>
> Now I have made my own changes and want to save the changes in CVS. But
> I don't yet want to commit to the main branch of the remote repository
> since the changes are not final . What are the possible ways to do
> this?
>
> Should I create a branch in the remote repository, commit to that
> branch and merge the changes to the main branch when the changes are
> final?

This is the most reasonable thing to do, at least with CVS.

cvs update -dP
cvs tag my-branch-point
cvs tag -b my-branch
cvs update -dP -r my-branch
cvs commit

when things are final, merge the changes back to mainline:

cvs get the_project
cd the_project
cvs update -dP -j my-branch-point -j my-branch
... resolve conflicts if any, test the resulting code ...
cvs commit

> Or can I create a local ( my own ) CVS repository, make commit(s) to it
> and commit at one go to the main branch of the remote repository? In
> this case, how can I update the local repository when someone commits
> to the main repository? ( I actually prefer this way..)

CVS is weak for such things. You will need a distributed VC system for
this to work flawlessly.

-- Sergei.