[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Subversion 1.5

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-03-14 08:45:09 CET

"Greg Stein" <gstein@gmail.com> writes:
> And continually peeved that "merge the branch into trunk" didn't
> happen right after the summit like people had discussed. So here we
> are five/six months later without any serious visibility/testing on it
> because "oh wah wah, it isn't ready." It will NEVER be ready as long
> as it sits on a branch.
>
> Branches were supposed to be for features that could destabilize and
> needed to be evaluated before merging. Once it looked like they were
> reasonable, then you merge and complete them. I have no idea where the
> idea of "trunk is sancrosanct" came from, but it is death to important
> feature work. 1.4 is the stable, sancrosanct release. NOT trunk. "Does
> the feature generally work? Does it avoid mashing working copies? Does
> it keep server data intact?" All yes? Merge the thing. Only during
> that "this code will smear your WC over the drive" stage do you keep
> it separate.
>
> Am I being unfair because my time isn't contributed? Possibly. Maybe
> call me the peanut gallery. But I do know one thing from years of
> shipping stuff: what was done with the merge branch is NOT the way to
> get software shipped. It is really, really sad to see.

Hmm. Running with Greg's idea for a moment:

Do you think we should merge the sparse-directories branch into trunk
now, even though not all the API changes are done? They're "within
sight" of done... but I've been saying that for weeks now, and I'm
swamped :-). Maybe if it were in trunk, more people would be grok it
and it would get wrapped up sooner.

The downside is: once the API changes are in trunk, we have to get
them stabilized before releasing it (or we have to pull them out).

So psychologically, I've been hesitant to merge it because I felt like
cleaning up the resultant mess would be my responsibility, and I
wasn't sure I'd be able to do it fast enough for the community, which
wants a release. But maybe this attitude is just counterproductive.

Folks, what say? Just do it? Are you ready to lend a hand?

(I should add that I've been using the sparse-directories build as my
daily 'svn' for months now. It seems safe.)

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 14 08:45:22 2007

This is an archived mail posted to the Subversion Dev mailing list.