Re: dev branches - cvs

[Larry Jones]

KM writes:
> 
> 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?  

Yep.

> If so what's the best method..... especially if later you wish to merge
> your changes from the dev branch back to the trunk?

The best thing to do is to periodically merge the changes from the trunk
into your development branch using an ordinary merge.  You can use a
moving tag to keep track of what's been merged and what hasn't:

        # on the main branch:
        cvs tag br_merge

        # on the branch:
        cvs up -jbr_last_merge -jbr_merge

        # back on the main branch:
        cvs tag -F -rbr_merge br_last_merge
        cvs tag -d br_merge
-- 
Larry Jones

My upbringing is filled with inconsistent messages. -- Calvin