Re: Advice regarding Branches

[Pierre Asselin]

jeetu mahtani <address@hidden> wrote:

> We have several developers working on various branches. One of the
> developers is done with his fixes so I merged his branch into the Main
> trunk. Now the other developers who are working on their respective
> Branches need to also get these fixes.

Why ?  Why can't they finish their branch and merge them too ?
Why are they working on branches if they don't need to isolate themselves
from the trunk ?


> How do I make this Merge so the
> various developers are up to date with Main trunk updates?
> Thanks.

Start new branches up the trunk and merge the old branches into them.

    cvs commit                  # to oldbranch
    cvs update -A
    cvs tag newbranch_bp
    cvs tag -b newbranch
    cvs update -r newbranch
    cvs update -j oldbranch_bp -j oldbranch
    cvs commit

but I repeat:  something's fishy with your approach.

-- 
pa at panix dot com