> I would think that with the situation above, doing a cvs tag > VENDOR_R2_MERGED in the working directory where conflict resolution > was finished would be the safest method, to be sure you tagged the > resolved files and not something else.
On the other hand, if you have *deleted* a file, cvs tag won't tag the repository file. This can lead to interesting "file reappearing in my workarea" problems when others update to the tag.. Tough call. I used to do merges late in the day when concurrent checkins were unlikely. -- Shankar. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
