Forums / Developer / svn branches policy
Pavel Chtchevaev
Tuesday 08 June 2004 5:27:36 am
Could you please be more specific on svn branches policy?
The latest dev version is in trunk, when it's time for it it's copied to the stable branch, right?
Then it's tested & debugged, merged with trunk(if needed) and it's copied to the version branch...
hm..what is the releases branch for? Or am i missing something?
regards, Pavel
Bård Farstad
Tuesday 08 June 2004 5:52:44 am
I will try to clear up this a bit. We do all our development in trunk. This is at all times concerned unstable. When we do a new release we will create a branch under e.g. stable/3.4. This is the svn repository for version 3.4. No new features will go into this, only bugfixes. However we will continue the development of trunk and this will now eventually end up in the stable/3.5 branch.
When we fix a bug we will then fix that in the two latest stable versions, now 3.3 and 3.4, and in trunk.
So it you would like to run the latest version of eZ publish at all times for testing you should use trunk. If not stable/3.x is the branch you should use, as only bugfixes will be applied to those.
--bård
Documentation: http://ez.no/doc
Tuesday 08 June 2004 6:05:49 am
Thanx, it's very helpful yet what about releases and version branches(i know i'm too curious :))
Tuesday 08 June 2004 6:19:44 am
I think this is what you're looking for:http://ez.no/ez_publish/documentation/general_information/what_is_ez_publish/releases
Tuesday 08 June 2004 7:30:57 am
Exactly! Thanks a lot :)
Tuesday 08 June 2004 7:50:28 am
Well my previous post was too fast... The releases chart link you gave me is..m..m..not 'developer-oriented'. Is it possible to see something alike with /trunk and the rest of the branches?(sorry to bother you...i'm kinda interested in more technical information)
Tuesday 08 June 2004 11:59:47 pm
The only thing which is not in the diagram is the branch called trunk. This is is the branch used to fork off a new release at the time we call it beta (feature freeze). If you have a look at the diagram you will see that we have 6 branches (2.9, 3.0, 3.1, 3.2, 3.3 and 3.4 ). Currently we only do fixes in the 3.3 and the 3.4 branch. The other branches are only there for archive reasons.
So in addition to the other 6 branches we only have ONE development branch which is called trunk. We will now do development in trunk for a couple of months, wile we also do bugfixes in 3.3 and 3.4. When we are ready we will branch off a new release branch, 3.5, from the trunk branch.