Re: Branching

[Gaurav Vaish]

> 
> https://www.cvshome.org/docs/manual/cvs-1.11.17/cvs_5.html#SEC57

  I'm not sure if I got it correctly, but here's what I understood:

  1. You work on the same file. You do not create "a copy of the file"
after branching.

  2. To actually work on "branch" and "main trunk", this is how I should proceed

    a. Get the main trunk using "cvs co module". That's the HEAD
branch. Work on the files that you get here and it will be submitted
to the "main trunk".
    b. Get the branch using "cvs co -r branch_name module". Work on
the files that you get here and commits will be to this branch_name.

    c. To merge the changes from branch_name to "main trunk/HEAD", you
"cvs update -j branch_name file_set"


   Let me know if whatever I've understood is correct or not.



--
Cheers,
Gaurav Vaish
http://gallery.mastergaurav.org
-----------------------------------