On 2002.02.26 13:41 Alan Hourihane wrote: > On Tue, Feb 26, 2002 at 01:32:39PM +0000, Jos� Fonseca wrote: > > On 2002.02.26 13:19 Alan Hourihane wrote: > > >... > > >Your better off creating a branch from the trunk and merging your work > > >over that way. Seeing as the mach64-0-0-1 branch is still Mesa 3.4.x, > > >this is definately the best route. > > > > > > > I see, but after checking out the trunk I can't just do on the cvs root > dir > > > > cvs update -j mach64-0-0-2branch > > > > otherwise I'll get the same problems: it will merge non-conflicting > > updates in mach64-0-0-2-branch in places that should be let alone. > > > No, you'll have to pull your source code specific files over yourself - > manually ! >
OK. That's what I thought. > > I've read it and has lot of useful information (doesn't describe > > extensively this specific detail though). > > > It's basically like creating your own branch again from the trunk. > i.e. check out the trunk, tag it with your branch id. Now start > bringing over your mach64 changes incrementally - manually. > mmm.. > You'll have to make a lot of changes anyway as your mach64 code > certainly won't compile even with the Mesa 4.x codebase. First I'll just do as you told above, then I'll make a new branch were the work of adapting the mach64 code to mesa 4.x will be done. > > Alan. > Thanks very much for your explanations. They were very valuable. Regards, Jos� Fonseca _________________________________________________________ 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
