What does "is present in revision" mean

[Keith Beattie]

Hi all,

Short question:
What does the stderr message: 'cvs update: file foo.bar is present in
revision tag2' mean when doing a  'cvs up -j tag1 -j tag2'?

Background (not for the light-hearted):
foo.bar was originally added on branch B1 and subsequently merged to the
Trunk (creating a rev. 1.2).  Branch B2 was then created (foo.bar's branch
'id' is 1.2.2).  foo.bar is then removed on B1 (dead rev 1.1.2.2) and merged
to the Trunk again (creating a dead rev. 1.3).  Now on B2, foo.bar is
revised creating a rev 1.2.2.1.  B2 is now merged to the Trunk with the
above command and rather than a revised 1.4 revision of foo.bar being added
to the Trunk (as I expected) the above error is printed.

Is it just the case that when merging a file on a branch with a simple delta
(1.2 to 1.2.2.1) into the Trunk where the file is dead, I need to look for
"is present in revision" in the stderr of the up -j -j command?

Thanks,
ksb