On Fri, 2003-10-03 at 13:55, Felix Kühling wrote: > On Fri, 03 Oct 2003 12:14:32 -0700 > Eric Anholt <[EMAIL PROTECTED]> wrote: > > > Okay, I was going to merge trunk to the savage-1_0_0-branch, since > > updates to the savage driver in trunk help out with that work I've been > > Are you referring to the patch that Rafael Máximo sent yesterday? I was > going to look at it, but I didn't have time yet. After a quick glance it > looks like it reverts lots of changes S3 made to the driver.
That patch was based quite a bit on updates in XFree86 CVS from what I saw. I hadn't really looked at the 4.3.0 -> S3 changes to compare how much the trunk merge changes would affect that code. But then, if it fixes basic 2d rendering problems, maybe we shouldn't worry too much about how it messes with the S3 changes for now. It would be good to have someone with hardware who could test the 4.2.0 libGL/savage_dri.so against the CVS DDX before and after a trunk merge to see if it breaks things. Unfortunately, from what I've been told now the savage card I have (an MX) won't work. > > told. I went to the CvsPolicy wiki page and based on that did a tag on > > the savage branch of savage-1_0_0-trunk-premerge. Then I did cvs update > > -d -j HEAD. It ran for a while, and produced a large number of > > conflicts. Why should there be conflicts in files that weren't touched > > by the savage-branch? Is there a way to avoid having to deal with all > > of those? > > This is probably related to keyword substitutions. There is a node > "Merging and keywords" in the CVS info documentation. Basically you > should add "-kk" to the cvs update command line. This way keywords are > not substituded and can't cause phantom conflicts. Ahh, I'll give that a try. -- Eric Anholt [EMAIL PROTECTED] http://people.freebsd.org/~anholt/ [EMAIL PROTECTED] ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
