Reverting some files based on tags while leaving others (without tags) alone

[Eric Amundsen]

Here's my scenario:  we have a couple of hundred machine gen'd files.
We are hand moding a couple of them.  We also have a vendor who we
originally we got the files from, who may also be moding a few of them.
So I have this module with all these files in it, a few of which I want
to tag as modified by us.  Then we'll get a new shipment of files from
our vendor.  Assuming that all our changes are checked in, I copy all
the new stuff from the vendor as new working files, so I can quickly see
what's changed.  Of course, the files I marked as modified look like
they changed, even if the vendor didn't change from his version.  My
thinking was I would check everything in from the vendor, and then
revert to my version on just the files that I tagged :

cvs update -j HEAD -j M1 f1.txt
RCS file: /sppdgfs/software/cvsroot/dummy/f1.txt,v
retrieving revision 1.2
retrieving revision 1.1.1.1
Merging differences between 1.2 and 1.1.1.1 into f1.txt

This works, if I specify just the files that I tagged.  But if I don't
specify the files I tagged it wants to remove from the repository all
the untagged files.

cvs update -j HEAD -j M1
M f1.txt
RCS file: /sppdgfs/software/cvsroot/dummy/f1.txt,v
retrieving revision 1.2
retrieving revision 1.1.1.1
Merging differences between 1.2 and 1.1.1.1 into f1.txt
cvs update: scheduling f2.txt for removal   <-- I don't want this 
                                                to happen!

So I tried -f, but got the same result.

I think I understand that I'm asking cvs to merge with files that aren't
tagged, so it thinks they don't belong in that snapshot, so wants to
nuke them.  But it seems like the -f option should avoid that.  I don't
want to specify the files that are tagged, I just want to do a merge on
all the tagged files and leave all the rest alone ... help.
-- 
     _/_/_/ _/_/_/ _/_/_/ _/_/   _/_/_/_/ Eric L. Amundsen
    _/     _/  _/ _/  _/ _/  _/ _/        Special Purpose Processor
   _/_/_/ _/_/_/ _/_/_/ _/  _/ _/  _/_/   Development Group
      _/ _/     _/     _/  _/ _/    _/    Mayo Foundation, Rochester MN
 _/_/_/ _/     _/     _/_/   _/_/_/_/     507-538-5457; Fax 507-284-9171