Re: Adding Files To A Release Branch

[Mike Ayers]

Chuck Tomasi wrote:
> I'm still fairly new to CVS (less than two months). I'm using CVS 1.11.2 on
> a Solaris 7 and Solaris 8 system.  I have a main trunk for development and
> currently one release branch to maintain the production system.  Over the
> course of time the main trunk has had some files added and some removed.
> When I checkout the release branch at a given release tag, I get what I
> expect.  I apply my changes from the main trunk with a cvs update -jtag1
> -jtag2 file.  However, I'm still lacking the files that have been added and
> would like the release branch to reflect the files removed from the main
> trunk also.
>
> > From the release branch, what commands should I use to get rid of excess
> files and obtain the missing ones from the main trunk?

	You would handle this exactly as you handle it in the main branch, 
except that you do all your work in a tree that has been checked out 
from the branch in question.  Note that you will need to check for 
conflicts and merge as needed.  The general practice is, for each 
change in the main branch, decide whether or not the change will be 
applied to any branches, and apply the change to the branch as it is 
applied to the trunk.  Good practice is to make the apply/no apply 
decision early in the development, and to test the change against the 
branches as part of the development.


/|/|ike