Re: revision moving

[Larry Jones]

Edmund writes:
> 
> 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.

There isn't any way to move a revision, so you're going to have to
create a new revision on the branch and then get rid of the bogus
revision on the trunk.  What I'd suggest is:

1) Update your working directory to the branch (or checkout a new
working directory on the branch).

2) Merge the changes from the trunk into the branch:
        cvs up -j2.1 -j2.2 hist.wfm

3) Commit the changes to the branch.

4) Go back to the trunk (update -A or switch back to your original
working directory).

5) Remove the bogus changes:
        cvs up -j2.2 -j2.1 hist.wfm

6) Commit the fixed revision to the trunk.

Also, you said:
>
> Anyway, I created a new branch (r2_1_4_a) for one particular
> file (hist.wfm).

You almost always want to branch the entire directory, not just a single
file.

-Larry Jones

I told her to expect you to deny everything. -- Calvin