When you imported the latest sources, you applied two tags: The vendor branch tag, and the vendor version tag. The import applied the vendor version tag only to those files that were actually imported. Have you tried applying the vendor version tag to the latest revisions of all files on the vendor branch?
--- Forwarded mail from [EMAIL PROTECTED] hi, I use branches exclusively for vendor source. I was going merrily along with branching and merging till I hit this scenario. In the interest of time, the vendor sent only those files that were different from the last set they sent. Now when I try to merge, cvs schedules all the missing files for removal. I tried both cvs co [-rHEAD] -d testdir1 module cd testdir1 cvs update -j last_import_tag -j this_import_tag and cvs co -jrelease_tag (matches head rev) -j this_import_tag The best thing I can think of doing is checking out the head revision, copying over the changed files and commiting. Brute force, but anyone got a better way? --- End of forwarded message from [EMAIL PROTECTED] _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
