On Wed, Jun 26, 2002 at 02:17:26PM -0400, Leif Delgass wrote: >On Wed, 26 Jun 2002, Jos� Fonseca wrote: > [...] >> >> Yep. That's it. Basically one needs to checkout the trunk, tag it with >> the new mach64-0-0-5-branch, and then merge from the old branch (by >> doing cvs update -r mach64-0-0-4-branch in each relevant dir). The PITA, >> is adding the mach64 stuff to all Makefiles because the mach64 driver >> was never merged back into the trunk... > >Wouldn't it be easier to do 'cvs update -j mach64-0-0-4-branch'? That >should merge everthing from the branch (changes relative to the >branchpoint on the trunk), and I'll just have to merge any >conflicts/rejects by hand.
Perhaps. What I suggested was what I've done the last time. I make no claim that is the best method since as you can see my CVS knowledge is that deep! ;-) On the other hand I could not see on the CVS manpage how the -j option would have the effect you described. Is just a matter of trying anyway. Perhaps you should try instead what is suggested on "HOW TO MERGE THE TRUNK INTO YOUR BRANCH" in http://dri.sf.net/doc/cvspolicy.txt . Alan, hint? (Or "How have you just done now with the s3virge branch?") Jos� Fonseca ------------------------------------------------------- This sf.net email is sponsored by: Jabber Inc. Don't miss the IM event of the season | Special offer for OSDN members! JabberConf 2002, Aug. 20-22, Keystone, CO http://www.jabberconf.com/osdn _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
