Re: [Dri-devel] Re: Merging trunk changes into mach64 branch

[F. <j_r...@ya...>]

On Wed, Jun 26, 2002 at 04:22:07PM -0400, Leif Delgass wrote:
>On Wed, 26 Jun 2002, Alan Hourihane wrote:
>
>> On Wed, Jun 26, 2002 at 07:44:14PM +0100, José Fonseca wrote:
>> > Alan, hint? (Or "How have you just done now with the s3virge branch?")
>> 
>> cvs update -j HEAD
>> 
>> and resolve the conflicts by hand.
>
>OK, I can do that.  I guess it'll be about the same difficulty as merging
>the branch changes into the trunk code.  Jose, do you have anything else
>you want to commit before I tag the new branch?  I'm going to update my

No. I just have the new vertex template stuff but I'm still working on
it and it shouldn't be more difficult to commit directly to the new
branch.

>mach64-0-0-4-branch tree and tag it to create the new mach64-0-0-5-branch.  
>Then I'll merge in the trunk and start working on conflicts and the
>drmCommand changes.

Ok.

José Fonseca