[PD-dev] planning to attempt to upload 0.38 to CVS

[guenter geiger]

On Fri, 30 Jul 2004, Miller Puckette wrote:
> 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...

Yes, that was the idea. I just wanted to merge the differences between
the different "miller" releases back into main. At the end I did not
stick to that, so that the miller branch got terribly outdated.

I do agree with hc and Frank that you should stick to the MAIN branch.
This means that the MAIN branch is not stable all the time, but you
can tag it and make a tarball release when we think it is stable
(or for testing purposes or whatever).

The average use won't download from the CVS, but the tarball releases.

The other branches would be devel (a playground for new features).
I think this should be the branch were people can make suggestions and
at the same time implement them for testing.
Of course, you would have to decide at the end which of these additions
you want to have in the main branch. In order to make this easy, the
developers should prepare patches against the MAIN branch with a
description. This way it is easy for you to look at the changes and
apply them without too much hassle.

Bug fixes should be sent as patches against MAIN too.

Well, thats my idea about how to organize collaboration. I think
that write access against MAIN should be restricted (hc, you are
specialist there).

So, to resume, we have:

* MAIN (with release tags and restricted write access)
* devel_XX (as it was now, branched away from MAIN after a release)
* impd, etc, etc ..(other branches, maintained by single persons/groups,
  who go an even more adventurous way)

In my experience branching too much should be avoided. Merging is
not only difficult but it is easy to really break things.

Guenter

> 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 at 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
> >
> >
>
> _______________________________________________
> PD-dev mailing list
> PD-dev at iem.at
> http://iem.at/cgi-bin/mailman/listinfo/pd-dev
>