revision moving

[Edmund]

Hi,

I'm new to this list so please forgive me if I've asked something
that has already been asked before(likelihood of this is very
high).

I've been using CVS on and off over the past few years, but have
managed to install it on my NT workstation. (I tried to install the
CVSNT server but had some problems, so I just dumped it
in favor of a locally mounted system using WinCVS).

Anyway, I created a new branch (r2_1_4_a) for one particular
file (hist.wfm).   I then proceeded to modify the source under
the preconception that I was working on the new branch.
(Please don't laugh..I'm still a little confused with the concept
of branches.)  So I theoretically have two versions (2.0 and
one for r2_1_4_a).

After commiting the changes, I then looked at hist.wfm's graph,
and boom it hit me.  The commited changes were done with the
main-trunk source and not my branch source.   So now the
version is 2.2 in the main trunk as opposed to 2.2 in the
r2_1_4_a branch.

What I'd like to know is how do I move the revision from the
main trunk to the r2_1_4_a branch?  I don't think merging is
the right answer here as that'd make the r2_1_4_a branch
into the 2.0 trunk.

Thanks.
Ed