On Wed, 26 Jun 2002, Jos� Fonseca wrote: > On Wed, Jun 26, 2002 at 01:52:00PM -0400, Leif Delgass wrote: > >On Wed, 26 Jun 2002, Jos� Fonseca wrote: > > > >> On Wed, Jun 26, 2002 at 12:16:15PM -0400, Leif Delgass wrote: > >> [...] > >> >Jose, I think now would be a good time for us to merge the trunk into a > >> >new Mach64 branch. Brian released Mesa 4.0.3 and the trunk looks like > >> >it's been updated, and we need to convert to drmCommand as well. Plus > >> >there are ppc fixes that should help with our current texture problems. > >> > >> Okidoki. Feel free to start the merge whenever you want - before I join > >> you I just want to make the changes in the DRM I promised to the PPC guys > >> to debug the problems they've been experienced. I think that's a good > >> idea to bump the branch number too. > > > >It's been a while since I did a merge. I'm thinking I'll make the branch > >from the trunk (I'm checking out a fresh tree from the trunk now) and then > >merge in changes from mach64-0-0-4-branch once you've checked in anything > >you'd like to get in before the merge. Does that sound like the right > >way to do it? I was thinking this might be easier than merging the > >changes on the trunk into the branch since there's been a lot of activity > >on the trunk since our last branchpoint from it. > > > > 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. -- Leif Delgass http://www.retinalburn.net ------------------------------------------------------- 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
