I have just merged the trunk into my mach64-0-0-2-branch making
cvs update -kk -d -P -j HEAD
and I solved most of the conflicts, but I noticed that this is still not
enough for a proper merge. There are several directories unrelated to
mach64 that aren't in synch with the trunk because there were some changes
in the mach64 branch since the common point (probably due tue other merges
of the trunk).
One example is xc/xc/lib/GL/mesa/src/drv/ffb. I should go there and do:
cvs update -kk -d -P -j HEAD -C
to force complete update. I will also have to do this in several other
directories, some of them with -l option to avoid recursion into
directories that belong to mach64 alone.
Is this correct? Is there a better way to do this?
When I'm done, supposing I want to make a new mach64-0-0-3-branch, how
should I proceed then?
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
