[cvsnt] Branch woes

[UL Jarod]

To be completely honest, I've dug myself a bit of a hole.

Our project is a single module.  Our team planned to create a new generation
of the software with substantial changes that were not ready for deployment
to our users.  So we created a branch on the module called Delta.
Development then continued on both Delta and on the main trunk of the
module.

Here's my problem:  We have now reached a point where Delta needs to use
some crucial bug fixes that were made on certain trunk files.  We would like
Delta to have the most up to date code, as long as the trunk does not
contain any code which is still not ready for users.

This may not be the best way of going about this, and suggestions are
welcome!

My main question is this:  I'd like to update the changes that were made to
the trunk since the branching point onto Delta, and move the branch point to
the front of the trunk.  (Essentially rebranching, but without losing the
changes made on the delta branch.)

Any ideas would be very appreciated.

Jarod