On Wed, Oct 23, 2002 at 01:49:36PM -0500, Todd Denniston wrote: > Nick Patavalis wrote: > > > > You merge the local changes > > > > cvs co -j VENDOR_R1 -j VENDOR_R2 <module> > > > > You resolve the confilicts, test the new sources, and generaly make > > sure that everything is stable. Then commit your changes. Several > > commits may be necesairy since the conflict resolution may take some > > time. No problem though since the rest of the developers are safely > > isolated in the VENDOR_R2_MERGE branch). When you have finished with > > the conflict resolution and tests you tag the trunk accordingly > > > > cvs rtag VENDOR_R2_MERGED > > > > If at the point the rtag is ran above the last commit of a file happened > on the > branch would rtag place the tag on the HEAD version of the file (what we want > here, I think) or on the branch version of the file?
The tag will be placed on the most recent revision of the trunk (i.e the HEAD). ...Though I also have some confused ideas about what exactly HEAD means. Could please a CVS guru give us a precise *definition* of what the HEAD tag is? > 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. True! /npat -- flowchart, v.: To obfuscate (a problem) with esoteric cartoons. -- Stan Kelly-Bootle _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
