On Sun, Nov 03, 2002 at 05:28:36 -0700, Marc Aurele La France wrote: > On Sun, 3 Nov 2002, Alan Hourihane wrote: > > > > > > > CVSROOT: /home/x-cvs > > > > > > Module name: xc > > > > > > Changes by: [EMAIL PROTECTED] 02/10/30 04:52:44 > > > > > > > Log message: > > > > > > 441. Import Mesa-4.0.4, and resync with the DRI trunk (DRI Project). > > > > > > This change backed out a lot of my portability fixes. > > > > > > Please re-instate them. > > > > > Gladly, just point me in a direction of where the reversion happened, > > > > and I'll do that. > > > > I see you had the foresight to tag the tree before this "merge". So, > > > figure out which changes between dri-20020222-merge and ah-20021030 were > > > not also in DRI's CVS. I'm sorry I don't have anything more > > > straight-forward, but that's a consequence of the pain these merges cause > > > when they are not properly done. > > > I tagged the tree ah-20021030 before the merge and ah-20021030-postdri > > after the merge. I've diff'ed the two tags and can't see any problems. > > That's not the diff I want to do look at.
O.k. I'll do that to double check, but diffing the tags that I mentioned should show the files modified by the merge - shouldn't it ? Alan. _______________________________________________ Cvs-commit mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/cvs-commit
