[Bug 2003] RFE: Update xc/extras/Mesa/ to Mesa 6.2

[bugzilla-daemon at freedesktop.org]

Please do not reply to this email: if you want to comment on the bug, go to          
the URL shown below and enter yourcomments there.   
 
https://bugs.freedesktop.org/show_bug.cgi?id=2003        
   

ajax at nwnk.net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|ajax at freedesktop.org        |ajax at nwnk.net




------- Additional Comments From ajax at nwnk.net  2004-12-13 07:37 -------
(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.        
   
   
--         
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email       
   
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.