Re: [Devil-linux-develop] Making changes to 1.0?

[Friedrich L. <fl...@fl...>]

Bruce Smith wrote:
> I should probably update the firewall script in 1.0 and 1.1 as someone
> suggested.  Since I've never worked with multiple branches, let me make
> sure I know what I'm doing so I don't screw something up.
> 
> I haven't done anything since the new 1.1 branch, so my hard drive now
> contains all the 1.1 files, correct?  (it better! :)
> 
> To modify a file in 1.0, I need to check it all out from CVS, correct?
> Do I need to re-download everything, or is there any to short-cut this
> by copying over my 1.1 directory to somewhere else?
> 
> If I commit something in 1.0, does the change automatically go to 1.1,
> or do I have to manually commit it in 1.1 too?
> 
> Anything else I should know ... ?  :-)

I think you have to:
  * remove the unchanged script in question
  * check it out with the tag of the 1.1 branch
  * make modifications
  * check them in
  * merge the branch of your script with the main branch

See also http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_5.html
especially http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_5.html#SEC62

-- 
MfG / Regards
Friedrich Lobenstock
____________________________________________________________________
Friedrich Lobenstock                       Linux Services Lobenstock
URL: http://www.lsl.at/                         Email: fl...@fl...
____________________________________________________________________