Created attachment 1535 [details]
[FIXED_X11R68x] probable-6.2.1-update.patch.gz

i believe, if you were to import 6.2.1 into Xorg, that the diff between the
last 6.1 import and the resulting MESA branch head would look like this.  i'll
do the import against the live tree in the morning, when i'm not so groggy.

rather than applying this patch, there should be a proper import, and then the
MESA-6_2_1-2004121X tagged files should also be tagged XORG-6_8_2 at release. 
something like:

cvs -d[...]/cvs/xorg rtag -r MESA-6_2_1-2004121X XORG-6_8_2 xc/extras/Mesa

Comment on attachment 1535 [details]
[FIXED_X11R68x] probable-6.2.1-update.patch.gz

nominating Mesa 6.2.1 for inclusion; this patch represents the changes that
would be applied.

The normal procedure for this would be something along these lines (minus
spelling errors, etc.):
Do import as normal for HEAD
  cd /usr/src
  cvs -d(xorg) co xc
  cd /usr/src
  cvs -d(mesa) co -rmesa-6_2-branch Mesa
  cd Mesa
  rm -rf `cat /usr/src/xc/extras/Mesa/XOrg-Xlist`
  cvs -d(xorg) import xc/extras/Mesa MESA MESA-6_2-20041213
  cd xc/extras/Mesa
  cvs up -jMESA:yesterday -jMESA
  (resolve conflicts)
  cvs ci -m "resolve conflicts from MESA-6_2-20041213 import"
  (Build & test)
Update 6_8 branch:
  cd /usr/src/xc
  cvs up -Pd -rXORG-6_8-branch
  cd xc/extras/Mesa
  cvs up -jMESA
  (resolve conflicts)
  (Build & test)
  cvs ci -m "Merge MESA-6_2-20041213 to 6.8"
Release 6.8.

Now, hopefully we'll have 6.2.1 instead of a snapshot of 6.2, but this is the
general idea, I think.  I'm not 100% sure on the arguments for cvs up -jMESA,
having not done it, but I guess my point is that tagging is not what we want
here.  And don't forget the XOrg-Xlist step, which I don't think I'd mentioned
before.

(In reply to comment #3)
> The normal procedure for this would be something along these lines (minus
> spelling errors, etc.):
> Do import as normal for HEAD
>   cd /usr/src
>   cvs -d(xorg) co xc
>   cd /usr/src
>   cvs -d(mesa) co -rmesa-6_2-branch Mesa

Shouldn't this be "co -r MESA-6_2_1"? ie not the tip of the branch but the
release snapshot.  6.2.1 has been tagged.

>   cd Mesa
>   rm -rf `cat /usr/src/xc/extras/Mesa/XOrg-Xlist`
>   cvs -d(xorg) import xc/extras/Mesa MESA MESA-6_2-20041213
>   cd xc/extras/Mesa
>   cvs up -jMESA:yesterday -jMESA
>   (resolve conflicts)
>   cvs ci -m "resolve conflicts from MESA-6_2-20041213 import"
>   (Build & test)
> Update 6_8 branch:
>   cd /usr/src/xc
>   cvs up -Pd -rXORG-6_8-branch
>   cd xc/extras/Mesa
>   cvs up -jMESA
>   (resolve conflicts)
>   (Build & test)
>   cvs ci -m "Merge MESA-6_2-20041213 to 6.8"
> Release 6.8.

Okay, that makes sense.

> Now, hopefully we'll have 6.2.1 instead of a snapshot of 6.2, but this is the
> general idea, I think.  I'm not 100% sure on the arguments for cvs up -jMESA,
> having not done it, but I guess my point is that tagging is not what we want
> here.  And don't forget the XOrg-Xlist step, which I don't think I'd mentioned
> before.

I don't remember you mentioning it, thanks.

http://freedesktop.org/~ajax/probable-6.2.1-update.patch

Comment on attachment 1535 [details]
[FIXED_X11R68x] probable-6.2.1-update.patch.gz

Approval for X11R6.8.x stable branch granted in the 2004-12-13
release-wranglers phone call.

ajax: I'll talk to you later today about the commit details...

It seems the Mesa upgrade to Mesa 6.2 was incomplete - trying to build
it on SuSE 8.2 results in the following compillation error:
-- snip --
rm -f program.h
ln -s ../../../../extras/Mesa/src/mesa/shader/program.h program.h
make[5]: *** No rule to make target
`../../../../extras/Mesa/src/mesa/shader/shaderobjects.c', needed by
Stop.
make[5]: Leaving directory
`/home/gismobile/projects/xorg/work005/xc/lib/GL/mesa/shader'
make[4]: *** [includes] Error 2
make[4]: Leaving directory
`/home/gismobile/projects/xorg/work005/xc/lib/GL/mesa'
make[3]: *** [includes] Error 2
make[3]: Leaving directory
`/home/gismobile/projects/xorg/work005/xc/lib/GL'
make[2]: *** [includes] Error 2
make[2]: Leaving directory
`/home/gismobile/projects/xorg/work005/xc/lib'
make[1]: *** [includes] Error 2
make[1]: Leaving directory `/home/gismobile/projects/xorg/work005/xc'
make: *** [World] Error 2
-- snip --

Mesa 6.2.1 merged to both HEAD and 6.8 branch, closing.

sorry about that shaderobjects bug, should be fixed.