CVS Tags

[squiz]

I see that 1.6.0 final has now been released in binary format, but has not been tagged in CVS.

 

I don't want to appear to be complaining, or overly fussy, but might I suggest that greater use is made of CVS tags or labels. In my experience, it is a great help in knowing exactly which version you are testing on. As a linux user, if I wanted to test a particular RC, or switch between RCs to track down a particular bug, I would have to try to guess when the RC was built and get cvs from that time.

 

It is a bit late now, but I think every binary release (that means RCs and not just full releases) should also be tagged. There is very little overhead or effort in doing so and the advantages are that you can always test with a defined state.

 

Anyway the final release should at the very minimum be labelled.

[bluap]

Anyway the final release should at the very minimum be labelled.

I agree with what you say squiz but all we can do now is label this release. The version number change has not been committed to CVS but I hope I updated the make.default to be correct a day or so ago. Judging from what Entropy has said in other threads the version number should be 1.6.0 and the protocol second number increased from 19 to 20. Here's the patch:

Index: elc_private.h
===================================================================
RCS file: /cvsroot/elc/elc/elc_private.h,v
retrieving revision 1.40
diff -a -u -r1.40 elc_private.h
--- elc_private.h	   19 Nov 2007 19:54:17 -0000	  1.40
+++ elc_private.h	   27 Mar 2008 11:19:00 -0000
@@ -5,19 +5,19 @@
#define ELC_PRIVATE_H

/* VERSION DEFINITIONS */
-#define VER_STRING	 "1.5.0.0"
+#define VER_STRING	 "1.6.0.0"
#define VER_MAJOR	  1
-#define VER_MINOR	  5
+#define VER_MINOR	  6
#define VER_RELEASE	0
#define VER_BUILD	  0
#define COMPANY_NAME   ""
-#define FILE_VERSION   "1.5.0"
+#define FILE_VERSION   "1.6.0"
#define FILE_DESCRIPTION	   "Eternal-Lands Client"
#define INTERNAL_NAME  ""
#define LEGAL_COPYRIGHT		""
#define LEGAL_TRADEMARKS	   ""
#define ORIGINAL_FILENAME	  ""
#define PRODUCT_NAME   "Eternal-Lands Client"
-#define PRODUCT_VERSION		"1.5.0"
+#define PRODUCT_VERSION		"1.6.0"

#endif /*ELC_PRIVATE_H*/
Index: main.c
===================================================================
RCS file: /cvsroot/elc/elc/main.c,v
retrieving revision 1.126
diff -a -u -r1.126 main.c
--- main.c	  22 Mar 2008 08:37:13 -0000	  1.126
+++ main.c	  27 Mar 2008 11:19:00 -0000
@@ -66,7 +66,7 @@
int client_version_release=VER_RELEASE;
int	client_version_patch=VER_BUILD;
int version_first_digit=10;	//protocol/game version sent to server
-int version_second_digit=19;
+int version_second_digit=20;

int gargc;
char **  gargv;

If that and make.defaults are OK, I'll happily commit the version change and label CVS.

[Entropy]

The idea is that the tagging should happen when the server is updated, otherwise some people might have problems (using the old version number), etc.

[hussam]

I tried bluap's changes but I still get 1.5.0

 

Edit.. Sorry for the alarm I had forgotten to make -f Makefile.linux clean before rebuilding

 

It now correctly shows 1.6.0

Edited March 28, 2008 by hussam

[alvieboy]

The idea is that the tagging should happen when the server is updated, otherwise some people might have problems (using the old version number), etc.

 

We can always to an update with date as tag, so, as long as we know when it was released, we can manage ourselves.

 

I do it a lot, because I have some huge repositories and tagging there can take up to an hour, so I just write down the date, and then use "cvs up -D 'YYYY/MM/DD HH:MM:SS' " to fetch what I want (this also can be used in branches).

 

Unfortunately, CVS does not allow "local tags", ie, tags that are only done by the client. A CVS tag is just a symbolic name for a version, and mean different versions for each file on the repository (for those that do not know exactly what a CVS tag is). So a tag named "MYTAG" can refer to "file.a", version "1.1" and to "file.b" version "1.9".

 

Beware when using -D, because the date tag is also sticky (it will be used later whenever you do updates).

 

Álvaro