dev branches - cvs

KM <[email protected]>
Newsgroups gmane.comp.version-control.cvs.general
Message-ID <[email protected]>
a theoretical question... 


it is an easy concept when you create a branch of the production version from a tag or latest trunk and use it for updates or bug fixes...you may then elect to merge the branch back in to the trunk where future dev has started.

however if you create a branch for development and use it for a long period while another version is going along the trunk.... to keep up with the latest code from the trunk... don't you need to merge into the branch any changes using diff or something, so you know current dev isn't corrupting or messing up your dev on the branch for the future?   If so what's the best method..... especially if later you wish to merge your changes from the dev branch back to the trunk?

Just thinking out loud
KM
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.