Re: [Freeciv-Dev] (PR#39536) Stable branch version number

2007-08-16 Thread Marko Lindqvist

http://bugs.freeciv.org/Ticket/Display.html?id=39536 >

On 16/08/07, William Allen Simpson <[EMAIL PROTECTED]> wrote:
>
> Marko Lindqvist wrote:
> >  This ticket can be closed when procedure is documented.
> >
> For "svn purists" the latter is preferable.

 I know some who think that "tag is what it is and should never be
modified". I think I have seen that even in some svn manual as a
warning after chapter that makes it clear that in fact svn tags are
just like branches.
 Of course, actually there is *no* such things as branches or tags in
svn. There is just one big directory hierarchy (that's why all
branches share revision number), from which we usually refer only to
one subdirectory.

 Off topic: I have considered getting checkout of whole tree, so I
could sometimes commit bugfix to all branches in one commit.


 - ML



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39536) Stable branch version number

2007-08-16 Thread William Allen Simpson

http://bugs.freeciv.org/Ticket/Display.html?id=39536 >

Marko Lindqvist wrote:
>  This ticket can be closed when procedure is documented.
> 
For "svn purists" the latter is preferable.

Remember, unlike CVS, in subversion tags are the same as branches.  There
is no implementation difference, zero copy, and all the usual subversion
advantages.  From the manual:

   In Subversion, there's no difference between a tag and a branch.
   Both are just ordinary directories that are created by copying.

That's why setting the version in the tagged branch is the right thing to
do.  It's a property of the snapshot, not of the S2_1 branch.

And why svn merge of recent S2_1 changes into beta5 is OK.  I really hate
the idea of "skipping" beta5.  Folks will have to explain what happened.
Beta5 has not yet been released to the public.  Yes, there are a few
versions floating around among developers -- but who cares?



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39536) Stable branch version number

2007-08-16 Thread Marko Lindqvist

http://bugs.freeciv.org/Ticket/Display.html?id=39536 >

On 11/08/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote:
>
>  I think we should set real release number for stable branch only for
> the time it takes to tag. That is:
> 1) Set release version number to branch
> 2) Tag
> 3) Set branch version number to branch.
>
>  Another possibility would be to tag with branch version number, and
> then to correct version number in tag (and now svn purists will kill
> me...)

 We have to decide which method to use when releasing beta6. I prefer
first one, but if Daniel decides to use second, I'm not complaining.
 This ticket can be closed when procedure is documented.


 - ML



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39536) Stable branch version number

2007-08-13 Thread Egor Vyscrebentsov

http://bugs.freeciv.org/Ticket/Display.html?id=39536 >

On Sat, 11 Aug 2007 Marko Lindqvist wrote:

>  Stable branch simply uses what version information was set for
> previous tag. So currently S2_1 claims to be '2.1.0-beta4'.
>  Not big problem for private play, but in the metaserver real beta4
> and current S2_1 should show up as different things.

And also there is a problem with 'make dist' - it always makes
'2.1.0-beta4' tar.gz with non-'2.1.0-beta4' source...

>  I think we should set real release number for stable branch only for
> the time it takes to tag. That is: 1) Set release version number to
> branch 2) Tag 3) Set branch version number to branch.
>  Another possibility would be to tag with branch version number, and
> then to correct version number in tag (and now svn purists will kill
> me...)
>
>  By 'branch version number' I mean something like '2.1.0-svn' (or
> maybe '2.1.0-beta4+')

Latter is better in case of packet manager. ('cause "svn" > "beta5".)
However, doesn't 'beta4+' too similar to 'beta4'?

>  If nobody reacts to this mail, I will at least change S2_1 version
> number to '2.1.0-beta4+'.

Just do it! :)

-- 
Thanks, evyscr



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#39536) Stable branch version number

2007-08-11 Thread Marko Lindqvist

http://bugs.freeciv.org/Ticket/Display.html?id=39536 >

 Stable branch simply uses what version information was set for
previous tag. So currently S2_1 claims to be '2.1.0-beta4'.
 Not big problem for private play, but in the metaserver real beta4
and current S2_1 should show up as different things.

 I think we should set real release number for stable branch only for
the time it takes to tag. That is: 1) Set release version number to
branch 2) Tag 3) Set branch version number to branch.
 Another possibility would be to tag with branch version number, and
then to correct version number in tag (and now svn purists will kill
me...)

 By 'branch version number' I mean something like '2.1.0-svn' (or
maybe '2.1.0-beta4+')


 If nobody reacts to this mail, I will at least change S2_1 version
number to '2.1.0-beta4+'.


 - ML



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev