On 2002.02.26 13:19 Alan Hourihane wrote:
> On Tue, Feb 26, 2002 at 01:06:17PM +0000, Jos� Fonseca wrote:
> > 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?
> >
> 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.
I still have to do the update in specific places, i.e., only for mach64
related files and dirs, isn't it?
> Check out the cvspolicy.txt on the dri website for more information
> on how we control the cvs.
>
I've read it and has lot of useful information (doesn't describe
extensively this specific detail though).
> Alan.
>
Thanks.
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
