rcs -> cvs .....

[Jody Brownell]

Hello,

I have a small dilema. In our current development environment we have
two seperate source trees. One of which is under RCS where development is on
going for another month or two. The other tree is under CVS as a new
version.
Both trees have identical structure but have followed different paths of
development.

My problem is this, every now and again, source form the RCS tree will have
to
be merged with the CVS tree so version 3.2 of our product will have certain
bug
fixes etc. But only certain fixes not all of them :) anywho ....

The only way I have been able to succeed it to copy files from the working
RCS
version into the working CVS directory. Then perform an update. The only
problem is
if the working copy of the CVS is the latest in the repository, no merge is
performed.
The only work around I could find would be to do a *dumb* commit on the file
from a
different working directory and redo the update/merge. This works enough to
be able to
remove any discrepencies between the RCS and CVS track, which I will later
commit.

Is there any other way to perform the merge/update from RCS to CVS with out
the copying,
*dumb* commit etc?

thanks.

Jody Brownell
Product Development
Core Networks Inc.

Ph: (902) 481-5750, ext. 2132
Fax: (902) 481-5799
address@hidden

CoreOS - Broadband Provisioning System - http://www.CoreNetworks.com
Streamline account provisioning, support processes, IP address and DHCP
management and RF level monitoring, for both DOCSIS and proprietary systems.

Visit us at Booth #2169
The Western Cable Show
Los Angeles Convention Center
November 28 - December 1, 2000
http://www.calcable.org