[Xorg] Re: CVS Update: xc (branch: trunk)

[Eric Anholt]

On Tue, 2004-06-29 at 08:05, Roland Mainz wrote:
> CVSROOT:	/cvs/xorg
> Module name:	xc
> Changes by:	gisburn at pdx.	04/06/29 08:05:37
> 
> Log message:
>   Fix for freedesktop.org/bugzilla/show_bug.cgi?id=805 - Build fix for Linux/AMD64
> 
> Modified files:
>       ./:
>         ChangeLog 
>       xc/extras/Mesa/src/mesa/main/:
>         imports.h 

Please, please, please do not commit to xc/extras/Mesa unless it's
something that xorg requires to be done there that can't be merged
upstream.  Changes to bring files off the vendor branch will lead to
more and more pain when trying to merge DRI bits.

The proper solution with CVS to get the change into Mesa, check out the
vendor branch, and commit the same change on the vendor branch (or just
arrange to do a whole new import at the time).  If you don't want to do
that yourself, please bugzilla and assign to me.

-- 
Eric Anholt                                eta at lclark.edu          
http://people.freebsd.org/~anholt/         anholt at FreeBSD.org