Am 16.02.2011 15:46, schrieb John Stoneham:
Can you clear this up for me?

Here's the way I understand it.
- Even numbers are reserved for stable releases: 0.9.28.2 is the current
stable release.
- Odd numbers are used for the development branch: 0.9.31 is the current
svn development branch. (Why isn't it 0.9.29 then?)

It was 0.9.29, but after the branch of the fixes_0.9.30 branch the new development version got the version 0.9.31.

- Fixes branch is for locking features and fixing bugs before a stable
release, basically the RC branch. So fixes_0.9.30 is... wait, on the
snapshots page it says fixes_0.9.29. What happened to fixes_0.9.30?


The snapshots are still compiled as 0.9.29, but they are from the fixes_0.9.30 branch (version of the branch and version of the application must not be the same).

So 0.9.31 in svn is what will eventually become the 0.9.32 stable
release, right? That means it contains things that are being developed
beyond (and will not be in) 0.9.30. And fixes_0.9.29 is what will be
0.9.30 stable, correct? But at some point a few weeks ago (I assume
before the fixes branch was created) the svn branch was 0.9.30, wasn't
it? And didn't this thread start out calling the fixes branch fixes_0.9.30?


The SVN structure is this:

|-\
| |_ fixes_0.9.28
|
|-\
| |_ fixes_0.9.30
|
trunk (aka 0.9.31)

The snapshot structure is this:
Lazarus 0.9.29 (aka 0.9.30, currently prepared for release)
Lazarus 0.9.31 (the current development version)

I don't know, I'm still confused. I guess the way I would do it, so that
it made sense to me, is to always have what will be the next stable
release as trunk. So trunk would now be numbered 0.9.29. And have a
branch numbered 0.9.31 for the development version containing things
that are being worked on for a still future release. So when 0.9.30 is
released, the branch numbered 0.9.31 would then become trunk. When it
gets close to the time to release 0.9.32, branch off a development
0.9.33. And so on.


trunk is always the main development version. All experimental features go in there. Then from time to time a release is branched from that trunk and stabilized.

Regards,
Sven

--
_______________________________________________
Lazarus mailing list
[email protected]
http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus

Reply via email to