To anyone that can help,
Here is little info about our CVS repository:
We have an existing CVS repository with
files in the repository called FOO ( pretend name) for a project called
foobar. Foobar currently has two different phases in which of the
software is being developed called phase 1 and phase 2. Phase 1 is the
baseline of code that is in the cvs repository baseline called FOO. Phase 2
builds off the phase 1 baseline expanding functionality. Phase1 is still
under development while phase 2 development is going on.
Here is what I did to make a problem I
believe:
Phase 2 software needs to be added
to foo cvs repository. To add the new phase 2 files that are not part of the
phase 1 baseline, I added the new phase 2 files as a branch and all files
added without a problem. Now I need to merge the new phase 2 files into
the phase 1 baseline except the phase1 baseline cannot see the new files that
are on the phase 2 branch and vice versa for phase 1. My question is how
do I get the phase 2 branched files to be part of the phase 1 in
cvs?
Thanks for the help,
Chad