Re: [glob2-devel] Update: Core Rewrite *Important, Steph really upset*

[Kai Antweiler]

I have pushed a new new commit into master, so that Bradleys experimental work
is not the tip our master branch.
Now everyone pulling master won't pull Bradleys changes, but our stable branch.


> > Actually, from what I've read in this mailing list, the only branching that
> > can be done is locally, unless you want to make a branch for everything on
> > your server (you are the only one that can). The best someone can do is tag
> > the code but that still uploads to the main thing I believe.

Yes and no.  In glob2 we have multiple branches in our remote repository.
Sticky tagging is a way to give different branches in a repository
names, so we can address them.  Everyone who pulls "master" wants a stable
glob2.  Anything experimental needs another name.
This is not the best way of handling branches, but it is the best way for us.


> The idea is to upload those changes in a branch, and when it is stable, just
> merge it into master. This is the way everyone develop rewrites out there.


Exactly!


> > And Bradley still has the code :P So if you want, just revert all the
> > changes. Its a SCMS for crying out load.

But people have pull in the mean time.  A since it is a distributed SCMS, only
the remote repository would change.


> > And lastly, I thought he was the maintainer? If he wanted to, he could I
> > thought.

That is only a title.  From my point of view Steph and you have been
the maintainers
in the last month.  Anyway, everyone can criticize when something goes wrong.


> maintaining is not about breaking everything. But it's not Bradley's fault, if
> you convinced him. But try to realize that there might be people that work
> even if they don't spent hours speaking on the ml.

I guess Bradley just has missed the mails about mercurial branching.
I can't imagine that he deliberately refuses to mark experimental work.
So please "hg branch <branchname>" your work, when your start a
rewrite.  Or in this case before your next local commit.


> > Besides, in all honesty, who else is actively developing code atm (other
> > than that cmake stuff which isn't affected by it anyway)? The map rewrite
> > is dead, the unit allocation has a way to go. Its not like he blew up 20
> > active projects :P
>
> Marvelous and I are developing a new object oriented functional scripting
> language. You can check the commit logs to convince yourself.

And Leo and Joe have been last month.  And from time to time people
unexpectedly come in and work.
Also there are users that want a somewhat stable glob2 developmental branch
for playing.  And we want them for testing it.
By the way: how is snapshooting going?

--
Kai Antweiler