Re: [Dri-devel] 4.3.0 merge

2003-03-31 Thread Ian Romanick
Alan Hourihane wrote: On Tue, Mar 25, 2003 at 10:57:05AM -0700, Brian Paul wrote: I'd really rather not put the 5.1 code into DRI at this point. With lots of changes going on, it's too much of an upkeep hassle to keep the DRI code up to date. Also, the current 5.1 code takes some illegal

Re: [Dri-devel] 4.3.0 merge

2003-03-31 Thread Brian Paul
Ian Romanick wrote: Alan Hourihane wrote: On Tue, Mar 25, 2003 at 10:57:05AM -0700, Brian Paul wrote: I'd really rather not put the 5.1 code into DRI at this point. With lots of changes going on, it's too much of an upkeep hassle to keep the DRI code up to date. Also, the current 5.1 code

Re: [Dri-devel] 4.3.0 merge

2003-03-31 Thread Alan Hourihane
On Mon, Mar 31, 2003 at 12:43:57PM -0700, Brian Paul wrote: Ian Romanick wrote: Alan Hourihane wrote: On Tue, Mar 25, 2003 at 10:57:05AM -0700, Brian Paul wrote: I'd really rather not put the 5.1 code into DRI at this point. With lots of changes going on, it's too much of an upkeep

Re: [Dri-devel] 4.3.0 merge

2003-03-31 Thread Alan Cox
On Mon, 2003-03-31 at 22:25, Alan Hourihane wrote: #ident $Id:$ But now that I've worked with CVS branches, I'm convinced that it and $Header:$ are quite evil. I always strip out the $Id$ tags from the Mesa sources when bringing them in to DRI. Alan just missed that. I

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Alan Hourihane
On Tue, Mar 25, 2003 at 01:40:57AM +, Alan Hourihane wrote: I'll finish up tomorrow, sorry for the build bustage for now. O.k. there's another issue here. I think I remember Ian merging in a fairly early rev of Mesa 5.1 into the trunk which is causing a lot of merge conflicts. So I'm going

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Brian Paul
Alan Hourihane wrote: On Tue, Mar 25, 2003 at 01:40:57AM +, Alan Hourihane wrote: I'll finish up tomorrow, sorry for the build bustage for now. O.k. there's another issue here. I think I remember Ian merging in a fairly early rev of Mesa 5.1 into the trunk which is causing a lot of merge

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Alan Hourihane
On Tue, Mar 25, 2003 at 06:52:57AM -0700, Brian Paul wrote: Alan Hourihane wrote: On Tue, Mar 25, 2003 at 01:40:57AM +, Alan Hourihane wrote: I'll finish up tomorrow, sorry for the build bustage for now. O.k. there's another issue here. I think I remember Ian merging in a fairly

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Keith Whitwell
Alan Hourihane wrote: On Tue, Mar 25, 2003 at 06:52:57AM -0700, Brian Paul wrote: Alan Hourihane wrote: On Tue, Mar 25, 2003 at 01:40:57AM +, Alan Hourihane wrote: I'll finish up tomorrow, sorry for the build bustage for now. O.k. there's another issue here. I think I remember Ian

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Brian Paul
Alan Hourihane wrote: On Tue, Mar 25, 2003 at 06:52:57AM -0700, Brian Paul wrote: Alan Hourihane wrote: On Tue, Mar 25, 2003 at 01:40:57AM +, Alan Hourihane wrote: I'll finish up tomorrow, sorry for the build bustage for now. O.k. there's another issue here. I think I remember Ian

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Keith Whitwell
I'm not averse to changing this policy for this merge (as opposed to backing these changes out bringing something else in). I'll stop the merge for now, until we get a consensus on how to continue. I'll defer to Brian on this. Keith ---

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Alan Hourihane
On Tue, Mar 25, 2003 at 05:34:00PM +, Keith Whitwell wrote: I'm not averse to changing this policy for this merge (as opposed to backing these changes out bringing something else in). I'll stop the merge for now, until we get a consensus on how to continue. I'll defer to Brian

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Michel Dänzer
On Die, 2003-03-25 at 18:55, Alan Hourihane wrote: Once the above 2 items is sorted, I'll tag the trunk again. But I'll await decisions on whether to carry on with Mesa 5.1 or not. I think Brian has explained pretty well why going with 5.1 is a bad idea. -- Earthling Michel Dänzer

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Brian Paul
Alan Hourihane wrote: On Tue, Mar 25, 2003 at 05:34:00PM +, Keith Whitwell wrote: I'm not averse to changing this policy for this merge (as opposed to backing these changes out bringing something else in). I'll stop the merge for now, until we get a consensus on how to continue. I'll

Re: [Dri-devel] 4.3.0 merge

2003-03-25 Thread Alan Hourihane
On Tue, Mar 25, 2003 at 10:57:05AM -0700, Brian Paul wrote: I'd really rather not put the 5.1 code into DRI at this point. With lots of changes going on, it's too much of an upkeep hassle to keep the DRI code up to date. Also, the current 5.1 code takes some illegal shortcuts with API

Re: [Dri-devel] 4.3.0 merge

2003-03-24 Thread Keith Whitwell
Alan Hourihane wrote: I'm going to start the 4.3.0 merge. Be prepared for breakage. I'll post another followup when I'm finished. Thanks for doing this, Alan. Keith --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven.

Re: [Dri-devel] 4.3.0 merge

2003-03-24 Thread Jens Owen
Keith Whitwell wrote: Alan Hourihane wrote: I'm going to start the 4.3.0 merge. Be prepared for breakage. I'll post another followup when I'm finished. Thanks for doing this, Alan. Definitely. Thanks, Alan. -- /\ Jens Owen/ \/\ _ [EMAIL

Re: [Dri-devel] 4.3.0 merge

2003-03-24 Thread Martin Spott
Jens Owen [EMAIL PROTECTED] wrote: Keith Whitwell wrote: Alan Hourihane wrote: I'm going to start the 4.3.0 merge. Be prepared for breakage. I'll post another followup when I'm finished. Thanks for doing this, Alan. Definitely. Thanks, Alan. Oh yes, this way we'll have best of both

Re: [Dri-devel] 4.3.0 merge

2003-03-24 Thread Alan Hourihane
On Mon, Mar 24, 2003 at 04:22:11PM -0700, Jens Owen wrote: Keith Whitwell wrote: Alan Hourihane wrote: I'm going to start the 4.3.0 merge. Be prepared for breakage. I'll post another followup when I'm finished. Thanks for doing this, Alan. Definitely. Thanks, Alan. No problems.