Branko Čibej <brane@xbc.nu> writes:
> Committers, please review this. We should get it into the 1.0.x branch
> in time for tomorrow's beta1.
[Responding in two threads, because this has been mentioned in two
threads now.]
I'm very confused :-).
We already had a tested patch that works for 1.0.0. Maybe you didn't
see it? (Or was there something wrong with it?)
Meanwhile, I don't understand why this patch bumps anything to 38. We
should be done with those interim numbers now. Both 1.0.x and trunk
will have SVN_VER_MAJOR = 1. Trunk will get SVN_VER_MINOR = 1, while
1.0.x gets SVN_VER_MINOR = 0. SVN_VER_PATCH just depends on what
release it is.
I don't quite understand the rest of the motivations in this change.
That's okay: we can talk about it while 1.0.0 goes out the door,
because we have a simpler patch for 1.0.0.
-Karl
> >Author: brane
> >Date: Thu Feb 19 13:02:35 2004
> >New Revision: 8731
> >
> >Modified:
> > trunk/subversion/include/svn_version.h
> >Log:
> >Change the version numbering scheme, as per HACKING.
> >The -dev and (dev build) tags now indicate that we're moving _towards_
> >the version number defined by SVN_VER_MAJOR, _MINOR and _MICRO. Empty
> >strings in the tag defines indicate a released version.
> >
> >* subversion/include/svn_version.h (SVN_VER_MINOR): Bump to 38.
> > (SVN_VER_TAG): Change to include the space and parentheses.
> > (SVN_VER_NUMTAG): Change to "-dev".
> > (SVN_VERSION): Don't include parentheses in the expansion.
> >
> >
> >Modified: trunk/subversion/include/svn_version.h
> >==============================================================================
> >--- trunk/subversion/include/svn_version.h (original)
> >+++ trunk/subversion/include/svn_version.h Thu Feb 19 13:02:35 2004
> >@@ -55,7 +55,7 @@
> > * Modify when new functionality is added or new interfaces are
> > * defined, but all changes are backward compatible.
> > */
> >-#define SVN_VER_MINOR 37
> >+#define SVN_VER_MINOR 38
> >
> > /** Patch number.
> > *
> >@@ -73,26 +73,32 @@
> >
> > /** Version tag: a string describing the version.
> > *
> >- * This tag remains "dev build" in the repository so that we can always
> >- * see from "svn --version" that the software has been built from the
> >- * repository rather than a "blessed" distribution.
> >+ * This tag remains " (dev build)" in the repository so that we can
> >+ * always see from "svn --version" that the software has been built
> >+ * from the repository rather than a "blessed" distribution.
> >+ *
> >+ * When rolling a tarball, we automatically replace this text with ""
> >+ * for final releases; in prereleases, it becomes " (Alpha)",
> >+ * " (Beta 1)", etc., as appropriate.
> > *
> >- * During the distribution process, we automatically replace this text
> >- * with something like "r1504".
> >+ * Always change this at the same time as SVN_VER_NUMTAG.
> > */
> >-#define SVN_VER_TAG "dev build"
> >+#define SVN_VER_TAG " (dev build)"
> >
> >
> >-/** Number tag: a string indicating whether this is a released version.
> >+/** Number tag: a string describing the version.
> > *
> > * This tag is used to generate a version number string to identify
> > * the client and server in HTTP requests, for example. It must not
> >- * contain any spaces. This value remains "+" in the repository.
> >+ * contain any spaces. This value remains "-dev" in the repository.
> > *
> >- * During the distribution process, we automatically replace this text
> >- * with "" to indicate a baselined version.
> >+ * When rolling a tarball, we automatically replace this text with ""
> >+ * for final releases; in prereleases, it becomes "-alpha", "-beta1",
> >+ * etc., as appropriate.
> >+ *
> >+ * Always change this at the same time as SVN_VER_TAG.
> > */
> >-#define SVN_VER_NUMTAG "+"
> >+#define SVN_VER_NUMTAG "-dev"
> >
> >
> > /** Revision number: The repository revision number of this release.
> >@@ -100,8 +106,8 @@
> > * This constant is used to generate the build number part of the Windows
> > * file version. Its value remains 0 in the repository.
> > *
> >- * During the distribution process, we automatically replace it with
> >- * what we guess to be the correct revision number.
> >+ * When rolling a tarball, we automatically replace it with what we
> >+ * guess to be the correct revision number.
> > */
> > #define SVN_VER_REVISION 0
> >
> >@@ -117,7 +123,7 @@
> > #define SVN_VER_NUMBER SVN_VER_NUM SVN_VER_NUMTAG
> >
> > /** Complete version string */
> >-#define SVN_VERSION SVN_VER_NUM " (" SVN_VER_TAG ")"
> >+#define SVN_VERSION SVN_VER_NUM SVN_VER_TAG
> >
> >
> >
> >
> >---------------------------------------------------------------------
> >To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> >For additional commands, e-mail: svn-help@subversion.tigris.org
> >
> >
> >
>
>
> --
> Brane Čibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 19 22:01:19 2004