Re: Lots of modules need merging

[David Zaroski]

On Mon, 4 Jun 2001, Steve Smale wrote:

SS>Bit of a nightmare one here...

A bit of an understatement.

SS>We therefore have project, project1, project2, project3, and project4, all
SS>of which are later stages of the same project, and all of which have a few
SS>weeks worth of version information in them.
SS>
SS>The thing i want to try to do is to pull them all into one module,

Can be done.

SS>'project', with using tags to mark each position. If the version
SS>information in each module can bekept, that will be ideal, but i guess if
SS>not we /could/ live without it...

Keeping the version info is not going to happen if he was creating new modules
of the same project all along. :-(

SS>Does anyone have any idea how i could go about doing this?

Here's one scenario:

        cvs co -P project1
        cd project1
        cvs import -d -I\! -ICVS -m "[whatever]" project [vendortag] [release 
tag]
        cd ..

Then do your merge, which a hint may or may not be given from the above
import.  Repeat the above process until all extraneous project[2-4] are
imported and merged into the single project.

.....Dave