Forums / Developer / svn branches policy

svn branches policy

Author Message

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

Pavel Chtchevaev

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 :))

Bård Farstad

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

--bård

Documentation: http://ez.no/doc

Pavel Chtchevaev

Tuesday 08 June 2004 7:30:57 am

Exactly! Thanks a lot :)

Pavel Chtchevaev

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)

Bård Farstad

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.

--bård

Documentation: http://ez.no/doc

eZ debug

Timing: Jan 18 2025 18:21:12
Script start
Timing: Jan 18 2025 18:21:12
Module start 'content'
Timing: Jan 18 2025 18:21:13
Module end 'content'
Timing: Jan 18 2025 18:21:13
Script end

Main resources:

Total runtime0.7935 sec
Peak memory usage4,096.0000 KB
Database Queries206

Timing points:

CheckpointStart (sec)Duration (sec)Memory at start (KB)Memory used (KB)
Script start 0.00000.0059 587.6094180.8438
Module start 'content' 0.00590.6782 768.4531580.6875
Module end 'content' 0.68410.1094 1,349.1406337.0703
Script end 0.7934  1,686.2109 

Time accumulators:

 Accumulator Duration (sec) Duration (%) Count Average (sec)
Ini load
Load cache0.00370.4685210.0002
Check MTime0.00140.1796210.0001
Mysql Total
Database connection0.00070.090210.0007
Mysqli_queries0.725791.45642060.0035
Looping result0.00160.20532040.0000
Template Total0.771797.320.3859
Template load0.00190.244020.0010
Template processing0.769897.009620.3849
Template load and register function0.00020.024310.0002
states
state_id_array0.00060.073510.0006
state_identifier_array0.00070.092920.0004
Override
Cache load0.00170.2104340.0000
Sytem overhead
Fetch class attribute can translate value0.00140.174730.0005
Fetch class attribute name0.00130.167780.0002
XML
Image XML parsing0.00090.116830.0003
class_abstraction
Instantiating content class attribute0.00000.0022100.0000
General
dbfile0.00310.3888280.0001
String conversion0.00000.000630.0000
Note: percentages do not add up to 100% because some accumulators overlap

CSS/JS files loaded with "ezjscPacker" during request:

CacheTypePacklevelSourceFiles
CSS0extension/community/design/community/stylesheets/ext/jquery.autocomplete.css
extension/community_design/design/suncana/stylesheets/scrollbars.css
extension/community_design/design/suncana/stylesheets/tabs.css
extension/community_design/design/suncana/stylesheets/roadmap.css
extension/community_design/design/suncana/stylesheets/content.css
extension/community_design/design/suncana/stylesheets/star-rating.css
extension/community_design/design/suncana/stylesheets/syntax_and_custom_tags.css
extension/community_design/design/suncana/stylesheets/buttons.css
extension/community_design/design/suncana/stylesheets/tweetbox.css
extension/community_design/design/suncana/stylesheets/jquery.fancybox-1.3.4.css
extension/bcsmoothgallery/design/standard/stylesheets/magnific-popup.css
extension/sevenx/design/simple/stylesheets/star_rating.css
extension/sevenx/design/simple/stylesheets/libs/fontawesome/css/all.min.css
extension/sevenx/design/simple/stylesheets/main.v02.css
extension/sevenx/design/simple/stylesheets/main.v02.res.css
JS0extension/ezjscore/design/standard/lib/yui/3.17.2/build/yui/yui-min.js
extension/ezjscore/design/standard/javascript/jquery-3.7.0.min.js
extension/community_design/design/suncana/javascript/jquery.ui.core.min.js
extension/community_design/design/suncana/javascript/jquery.ui.widget.min.js
extension/community_design/design/suncana/javascript/jquery.easing.1.3.js
extension/community_design/design/suncana/javascript/jquery.ui.tabs.js
extension/community_design/design/suncana/javascript/jquery.hoverIntent.min.js
extension/community_design/design/suncana/javascript/jquery.popmenu.js
extension/community_design/design/suncana/javascript/jScrollPane.js
extension/community_design/design/suncana/javascript/jquery.mousewheel.js
extension/community_design/design/suncana/javascript/jquery.cycle.all.js
extension/sevenx/design/simple/javascript/jquery.scrollTo.js
extension/community_design/design/suncana/javascript/jquery.cookie.js
extension/community_design/design/suncana/javascript/ezstarrating_jquery.js
extension/community_design/design/suncana/javascript/jquery.initboxes.js
extension/community_design/design/suncana/javascript/app.js
extension/community_design/design/suncana/javascript/twitterwidget.js
extension/community_design/design/suncana/javascript/community.js
extension/community_design/design/suncana/javascript/roadmap.js
extension/community_design/design/suncana/javascript/ez.js
extension/community_design/design/suncana/javascript/ezshareevents.js
extension/sevenx/design/simple/javascript/main.js

Templates used to render the page:

UsageRequested templateTemplateTemplate loadedEditOverride
1node/view/full.tplfull/forum_topic.tplextension/sevenx/design/simple/override/templates/full/forum_topic.tplEdit templateOverride template
7content/datatype/view/ezxmltext.tpl<No override>extension/community_design/design/suncana/templates/content/datatype/view/ezxmltext.tplEdit templateOverride template
8content/datatype/view/ezxmltags/paragraph.tpl<No override>extension/ezwebin/design/ezwebin/templates/content/datatype/view/ezxmltags/paragraph.tplEdit templateOverride template
3content/datatype/view/ezxmltags/line.tpl<No override>design/standard/templates/content/datatype/view/ezxmltags/line.tplEdit templateOverride template
3content/datatype/view/ezimage.tpl<No override>extension/sevenx/design/simple/templates/content/datatype/view/ezimage.tplEdit templateOverride template
1pagelayout.tpl<No override>extension/sevenx/design/simple/templates/pagelayout.tplEdit templateOverride template
 Number of times templates used: 23
 Number of unique templates used: 6

Time used to render debug report: 0.0002 secs