On Wed, Oct 23, 2002 at 01:58:27PM -0700, Shankar Unni wrote: > > 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..
Can you elaborate a bit on this? You mean deleted by the developers while working in the branch, or while doing conflict resolution in the trunk? /npat -- Dijkstra probably hates me -- Linus Torvalds, in kernel/sched.c _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
