Re: [Dri-devel] merging to branches

2003-10-05 Thread Felix Kühling
On Sun, 5 Oct 2003 01:46:40 +0200 Felix Kühling <[EMAIL PROTECTED]> wrote: [snip] > > The -kk didn't seem to help at all (cvs up -kk -d -j HEAD). I still got > > "C " in 537 files. > > Same problems here. I'm trying to merge the trunk to the config branch. > It is strange that cvs even attempts

Re: [Dri-devel] merging to branches

2003-10-04 Thread Felix Kühling
On Sat, 04 Oct 2003 16:02:53 -0700 Eric Anholt <[EMAIL PROTECTED]> wrote: > 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 > > > update

Re: [Dri-devel] merging to branches

2003-10-04 Thread Eric Anholt
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 referrin

Re: [Dri-devel] merging to branches

2003-10-04 Thread Felix Kühling
On Fri, 3 Oct 2003 17:57:47 -0500 (CDT) [EMAIL PROTECTED] wrote: > > >> 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

Re: [Dri-devel] merging to branches

2003-10-03 Thread pablosousa
>> 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. > > I'll see if I can set u

Re: [Dri-devel] merging to branches

2003-10-03 Thread Felix Kühling
On Fri, 03 Oct 2003 14:28:50 -0700 Eric Anholt <[EMAIL PROTECTED]> wrote: > 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 > > > update

Re: [Dri-devel] merging to branches

2003-10-03 Thread Eric Anholt
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 referrin

Re: [Dri-devel] merging to branches

2003-10-03 Thread Felix Kühling
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

Re: [Dri-devel] merging to branches

2003-10-03 Thread Alex Deucher
FWIW, the 2D drivers from the trunk and the code drop from VIA are VERY different. I'm not sure where you are seeing the conflicts... just an FYI... --- 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 tr

[Dri-devel] merging to branches

2003-10-03 Thread Eric Anholt
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 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