Help with merging:

[Dan . Crea]

Hello All:

I am somewhat new to CVS and I am still a bit confused when it comes to
merging.  I am trying to merge some changes from the main trunk into all
my branches.  I have a top level module with several sub-projects.  Each
sub-project has a file say bar.cpp.   I have made a change to bar.cpp in
each project on the main trunk and now I want to merge this into each
branch.

The only way I know how to do this is to co the branch and go into each
project directory and run a cvs update -j<rev> bar.cpp.  This however
requires me to traverse into each project directory, in my case I have
several dozen not to mention I need to do this for each branch.

Is there another way I can do this?

What I would like to do is at the root module directory run some sort of
recursive command that will exam the entire branch for the file bar.cpp
and merge the changes from the main trunk.

So for example if on the main trunk I changed the file foo.cpp in the
projects:

module/
        bar1/foo.cpp    ( may be rev 1.2 )
        bar2/foo.cpp    ( may be rev 1.5 )
        bar3/foo.cpp    ( may be rev 1.8 )

what is the best way to propagate these changes onto all my branches?

Thanks much!
Dan

( p.s please ignore the disclaimer; company policy I am afraid )


**************************************************************************************
This communication is intended solely for the addressee and is
confidential. If you are not the intended recipient, any disclosure,
copying, distribution or any action taken or omitted to be taken in
reliance on it, is prohibited and may be unlawful. Unless indicated
to the contrary: it does not constitute professional advice or
opinions upon which reliance may be made by the addressee or any
other party, and it should be considered to be a work in progress.
**************************************************************************************