On Fri, 23 Apr 2004, Tim Blechmann wrote:
I also wonder, how you approach the merging technically, so that others (like me) can help out with this. I could of course compare what is in the CVS with MSP-Pd file by file, but how do I find out, which parts are just new changes in the MSP verison, and what is a feature added by some of the other developers like Thomas, Tim or you?
I generally extract the differences between Millers versions and merge them into the devel branch. This is not always easy, especially if the diffs conflict. You need to know quite a bit about the working of Pd in some cases. You have to take special care about the parts that got included into Millers version from the CVS.
Is there a list of those patches somewhere?
i doubt that, although it would probably a good idea to add a cvs_changes.txt file for the changes from miller's branch ...
That would be a good idea. Up to now the only documentation we have is in the CVS logs.
Guenter
i could add something like that to the cvs soon, containing my changes ... (probably sunday afternoon) ... i hope other developers add their changes to this file ... maybe something like that helps us not to forget the changes on the cvs (as it happend from devel_0_37 to devel_0_37) and miller to add certain features to his branch ...
cheers...
Tim mailto:TimBlechmann@gmx.de ICQ: 96771783 -- The only people for me are the mad ones, the ones who are mad to live, mad to talk, mad to be saved, desirous of everything at the same time, the ones who never yawn or say a commonplace thing, but burn, burn, burn, like fabulous yellow roman candles exploding like spiders across the stars and in the middle you see the blue centerlight pop and everybody goes "Awww!" Jack Kerouac
PD-dev mailing list PD-dev@iem.at http://iem.at/cgi-bin/mailman/listinfo/pd-dev