On 6 Feb 2002, Jose Fonseca wrote: > Leif, > > On Wed, 2002-02-06 at 10:20, José Fonseca wrote:
[snip] > I also have 4.2.0 installed and my mach64 tree works fine with it so, > unless there is an immediate advantage in updating (like improvements in > mesa), I think is better to wait a little more for Frank. I agree, esp. if you're not having problems running against 4.2.0 with the current branch. > Anyway, I would like to know how one merges the trunk with a branch. > Could you briefly tell me the steps required? I have the branch checked out (so sticky tag is set), so to merge, I did this: cvs update -kk -dP -j HEAD > 2002-02-05-merge 2>&1 & tail -f 2002-02-05-merge "-j HEAD" means to merge (join) changes from the specified tag, in this case changes on the trunk since the branchpoint. I saved the output to a logfile so I could check to see where conflicts were reported (you can also rgrep for "<<<<<<<"). Then you need to manually merge any conflicts (I think I found 10 or fewer files with conflicts). Each file that has changes or conflicts will generate a dotfile (.#filename.revision) with the original that you can remove when you're done. > In the meanwhile I'm still going to see what can be done with the > current tree as it is (more bugfixes, features,...). > Some things on my bug list (Mesa driver): 1. glLines doesn't work 2. GL_DECAL, GL_BLEND, GL_REPLACE texture modes not working (GL_MODULATE seems to work). I haven't looked at the Mesa driver in a lot of depth yet, but it seems that lines could be hacked to use triangles. I also remember there being a lot of code in the driver disabled with #ifdef 0, so maybe I'll try looking at some of those sections. > Regards, > > Jose Fonseca > > PS: You have a very nice and interesting homepage! Makes one wanting to > go in a world trip too..! Thanks! As for the trip, round-the-world plane tickets are a great deal, you should check into it if you're thinking about a long trip. > I'm also adding a link in the FAQ to your mach64 section. OK. I'll try to keep it up to date, at least until the DRI site has an updated compilation guide and status for mach64. :) -- Leif Delgass http://www.retinalburn.net _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
