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

Re: Question regarding merging branches

From: Greg Stein <gstein_at_lyra.org>
Date: 2002-09-11 00:39:58 CEST

On Tue, Sep 10, 2002 at 11:58:19AM -0700, Justin Erenkrantz wrote:
> On Tue, Sep 10, 2002 at 08:43:28AM -0700, Kevin Pilch-Bisson wrote:
> > Note that Dylan's svn --version output said 0.14.2-dev which is not the same
> > as 0.14.2. The -dev implies that it came from a working copy, not a tarball,
> > so all we can say for sure is that the client was built sometime after 0.14.2.
>
> s/sometime after/sometime before/
>
> The -dev comes before the non-dev version.
>
> Nitpick for sure, but worth clarifying. -- justin

Great nitpick, but it doesn't apply to Subversion :-)

We don't actually have a concept of "in between" like the "-dev" string
symbolizes. It is a real pain in the ass, too, as a version string can say
0.14.2 but it *ISN'T* 0.14.2. The "dev build" thing helps, but foooo...

See, the problem is that we don't bump the version until just before we
release. Thus, we kind of hang out in this 0.14.2 state, and all the
non-release builds say "dev build". Of course, is that dev build exactly
0.14.2, or something later? Who knows.

I've been thinking that we need to patch up our stuff to be similar to
APR(UTIL) and have a -dev concept. We should be able to work in the -dev
thing in conjunction with the "dev build" vs "r3200" stuff when a release is
built.

Hmm. The -dev concept seems a bit orthogonal to the release stuff. I could
see a "0.14.3-dev (r3200)" out there. Or "0.14.3 (r3227)" for a formal
release.

Oh... and I also want to separate the version string into short/long forms.
Right now, our Apache server token looks like: SVN/0.14.2 (dev build). That
parenthesized portion is highly-nonstandard. We should be putting a "short"
form into the signature, and a long form for (say) 'svn --version'

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 11 00:40:39 2002

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