I've got an imported vendor branch, that I regularly update with new vendor releases. Most files in the vendor's sources are unmodified by me, so an import followed by an update conveniently pulls me up to the latest vendor versions.
Of course, for any files that I've modified (and thus exist on the trunk), I do an update -j VENDOR_V1 -j VENDOR_V2 followed by a commit to pull in changes. This is all well and good. However, I no longer need to modify some files that I previously modified and checked into the trunk. Each vendor release import requires me to manually merge and commit these files, which is a bit of a pain, and causes unnecesary noise on my commit notification mailing list. Is there any way to tell CVS that these files should track the vendor versions exactly, with no local changes? Or will am I stuck doing manual commits after every import? Thanks, Kenn _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
