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 On Tue, 2002-02-26 at 16:32, Jose Fonseca wrote: > I'm in the process of merging the files from mach64-0-0-2-branch into > the recently created mach64-0-0-3-branch from the trunk. > > The way I'm doing is (on a directory basis): > - make a diff of the entire directory to get the global picture of the > differences > - update the files that are only in the mach64-0-0-2-branch > - run xxdiff (a visual file merge) between the current branch and a > local updated copy of mach64-0-0-2-branch in the files that are common. > > Am I being too overzealous, i.e, can I trust on the 'cvs update' to > merge the differences of common files, or is it really best do it > manually, or is there a another way of doing things (other tool > perhaps)? > > Regards, > > Jose Fonseca > > > PS: Sorry for these beginner questions, but everyone has to learn a > first time, and I think that you can give a better advice than a CVS > user list since you know the code in question. _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
