You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Branko Čibej <br...@xbc.nu> on 2004/02/19 19:19:31 UTC
Re: svn commit: r8731 - trunk/subversion/include
Committers, please review this. We should get it into the 1.0.x branch
in time for tomorrow's beta1.
brane@tigris.org wrote:
>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 <br...@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
Re: svn commit: r8731 - trunk/subversion/include
Posted by kf...@collab.net.
Philip Martin <ph...@codematters.co.uk> writes:
> sion/tests/clients/cmdline/local_tmp/config" <TIME = 0.139510>
> Standard output does not match.
> Expected standard output:
> =====
> X.Y.Z
>
> =====
> Actual standard output:
> =====
> 1.1.0-dev
> =====
> FAIL: getopt_tests.py 3: run svn --version --quiet
I'm equally guilty here, as I approved this change too.
On it...
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r8731 - trunk/subversion/include
Posted by Philip Martin <ph...@codematters.co.uk>.
Branko Äibej <br...@xbc.nu> writes:
>>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".
sion/tests/clients/cmdline/local_tmp/config" <TIME = 0.139510>
Standard output does not match.
Expected standard output:
=====
X.Y.Z
=====
Actual standard output:
=====
1.1.0-dev
=====
FAIL: getopt_tests.py 3: run svn --version --quiet
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r8731 - trunk/subversion/include
Posted by Branko Čibej <br...@xbc.nu>.
Oh yes, and here's the patch that should be applied to 1.0.x afterwards,
when rolling the beta:
Index: svn_version.h
===================================================================
--- svn_version.h (revision 8731)
+++ svn_version.h (working copy)
@@ -48,14 +48,14 @@
*
* Modify when incompatible changes are made to published interfaces.
*/
-#define SVN_VER_MAJOR 0
+#define SVN_VER_MAJOR 1
/** Minor version number.
*
* Modify when new functionality is added or new interfaces are
* defined, but all changes are backward compatible.
*/
-#define SVN_VER_MINOR 38
+#define SVN_VER_MINOR 0
/** Patch number.
*
@@ -83,7 +83,7 @@
*
* Always change this at the same time as SVN_VER_NUMTAG.
*/
-#define SVN_VER_TAG " (dev build)"
+#define SVN_VER_TAG " (beta 1)"
/** Number tag: a string describing the version.
@@ -98,7 +98,7 @@
*
* Always change this at the same time as SVN_VER_TAG.
*/
-#define SVN_VER_NUMTAG "-dev"
+#define SVN_VER_NUMTAG "-beta1"
/** Revision number: The repository revision number of this release.
Compilation finished at Thu Feb 19 20:28:47
--
Brane Čibej <br...@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
Re: svn commit: r8731 - trunk/subversion/include
Posted by kf...@collab.net.
Branko Čibej <br...@xbc.nu> writes:
> Two things were wrong with that patch:
>
> * It doesn't deal with SVN_VER_NUMTAG
> * It doesn't solve the problem of "svn --version" printing "1.0.0
> ()" in the released -- i.e., non-Beta -- version.
>
> My patch addresses both these issues, that's why I committed it.
Okay, thanks.
> >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.
>
> Exactly -- "will have". 1.0 is not out yet, nor do we yet have a beta.
> Immediately after the 1.0.x branch starts displaying "1.0.0 (beta 1)"
> and "1.0.0-beta1, trunk should be changed to say "1.1.0 (dev build)" and
> "1.1.0-dev".
Trunk can say "1.1.x" right now, it doesn't need to wait for 1.0.
I see you're in IRC now, we'll chat there.
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r8731 - trunk/subversion/include
Posted by Branko Čibej <br...@xbc.nu>.
kfogel@collab.net wrote:
>Branko Čibej <br...@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?)
>
>
Two things were wrong with that patch:
* It doesn't deal with SVN_VER_NUMTAG
* It doesn't solve the problem of "svn --version" printing "1.0.0
()" in the released -- i.e., non-Beta -- version.
My patch addresses both these issues, that's why I committed 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.
>
Exactly -- "will have". 1.0 is not out yet, nor do we yet have a beta.
Immediately after the 1.0.x branch starts displaying "1.0.0 (beta 1)"
and "1.0.0-beta1, trunk should be changed to say "1.1.0 (dev build)" and
"1.1.0-dev".
> 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.
>
>
Exactly. Again, in the future.
The reason I bumped minor and not major on trunk is that I believe we
should bump major on the branch 1.0 first.
>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.
>
>
Simpler, but wrong.
--
Brane Čibej <br...@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
Re: svn commit: r8731 - trunk/subversion/include
Posted by kf...@collab.net.
Branko Čibej <br...@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 <br...@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