I wrote Guenter privately first, since I trust his opinion most of all! I think he's leaving soon (if he hasn't already) for vacation though.
I think the "miller" branch is just a copy of the code I maintain (and merge stuff into myself when appropriate.) I think Guenter then merges this into Main branch... if this is so, then I think there would now need to be both "stable" and "unstable" miller branches, that would be 0.37 (with my bug fixes; cuttently 0.37.2) and 0.38test. Then when 0.38 is ready I'd check it into "stable" and start putting 0.39 versions in "unstable". But this might be a gross misunderstanding of how to use CVS effectively.
I only adopt other people's code when I think I can maintain it... so for instance I don't have the 64 bit extensions yet because I don't have a 64-bit machine to test them on. So there will always be a need for something like the current "main" branch. I do sometimes try to merge changes from "main" back into my own branch -- but not all of them.
Another situation comes up often, that someone makes a feature that is clearly needed, but which I think should be implemented differently. An example is the "print" hook in devel... I like it, but I want to do it in a way that I think is cleaner...
It would be nice if there were an easy way to document the intent of the many branches that show up in CVS. I think most of them are dormant, but would presumably have to check them out and look at them all to know that...
cheers Miller
On Fri, Jul 30, 2004 at 12:40:16AM -0700, Hans-Christoph Steiner wrote:
This is great news! I'll through in my two bits, but I think others will have something to say about it. I think that the MSP sources should be the MAIN branch, then we can reserve other branches for development projects, like IMPD. Otherwise, I think that we will have too many branches without much gain. Also, Guenter has been merging the MSP code into the MAIN branch already. Since Guenter has been the merge-master, I think he's the one to ask about how it should be done going forward.
If you want, I can also set up access lists to restrict write access to the MAIN branch, at least until the transition to the CVS is complete. But it might not be necessary since all changes are logged and reversible.
.hc
On Jul 29, 2004, at 10:32 PM, Miller Puckette wrote:
Hi all,
I'm finally going to bite the bullet and try to check my Pd sources into the CVS site. I'm hoping to do this without causing too much damage to the existing CVS tree. Probably I'll just start a branch (named "msp-test" or something like that) and then, once I believe 0.38 is stable, copy it over to the "main" branch.
My sources are way broken right now, so I won't be doing this until at least sometime next week. So there's plenty of time for comments as to whether there's a better way to manage the tree...
cheers Miller
PD-dev mailing list PD-dev@iem.at http://iem.at/cgi-bin/mailman/listinfo/pd-dev
"If nature has made any one thing less susceptible than all others of exclusive property, it is the action of the thinking power called an idea, which an individual may exclusively possess as long as he keeps it to himself; but the moment it is divulged, it forces itself into the possession of everyone, and the receiver cannot dispossess himself of it."
- Thomas Jefferson