Leif, On 2002.02.26 19:35 Leif Delgass wrote: > So the mach64-0-0-3-branch is the DRI trunk with the new mahc64 dirs and > files added and changes from mach64-0-0-2-branch manually merged, right? >
For now it's just equal to the trunk. But my local copy is as you described. > Is the branch up to date with your working tree or do you still have > local > changes? I'd like to hack on this too, but I don't want to get in your > way if you're still working on merging. I can hold off on checking in > anything for a while. > I'm just making sure that everything compiles, except the mach64 Mesa driver of course, so that there isn't any file/merge missing. Then we can agree how to split the work to update the mesa dri driver. > btw, the problem I had with merging my 4.2.0-based tree was that I tried > to merge from the trunk a second time using the same command. That meant > it tried to merge changes that had already been merged. I think that to > get just the changes on the trunk since the last merge I would have had > to > specify dates or tags from the trunk. It's something to keep in mind for > future synching to the trunk. I see... I think that the cvspolicy.txt gives the steps and rules to do that. I hope between the next 5 hrs, or the next morning in the worst case, to commit. I'll get back to you then. Regards, Jos� Fonseca > > On 26 Feb 2002, Jose Fonseca wrote: > > > Well, I'm answering to my own question, just in case someone is also > > interested! > > > > I've finished merging and I'm now compiling. It's clear now that > > although making a 'cvs update' for everything would be quicker to get a > > merge, there would be several cases where the code wouldn't be properly > > merged and I would lose more time debugging after. > > > > Regards, > > > > Jose Fonseca > > -- > Leif Delgass > http://www.retinalburn.net > > _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
