Forums / General / Git stable-4.4 branch update

Git stable-4.4 branch update

Author Message

Sylvain Bannier

Wednesday 02 February 2011 9:04:05 am

Hi,

I noticed that github's
stable-4.4 branch isn't up to date.

For instance https://github.com/ezsystems/ezpublish/blob/stable-4.4/kernel/classes/ezcontentobjecttreenode.php doesn't match with the current 4.4 distributed here : http://share.ez.no/download-develop/downloads/ez-publish-community-project-4.4-fuji#platform

for instance, line 3783 on github :

$hasPendingObject = false;
        $db = eZDB::instance();        $db->begin();
        $userClassIDArray = eZUser::contentClassIDs();
        foreach ( $deleteIDArray as $deleteID )        {

and in 4-4 :

$canRemoveAll = true;
        $db = eZDB::instance();        $db->begin();
        $userClassIDArray = eZUser::contentClassIDs();
        foreach ( $deleteIDArray as $deleteID )        {            
$hasPendingObject = false;

Is this normal ? Is there a real 4-4 somewhere on github ?

http://www.smile.fr

Robin Muilwijk

Wednesday 02 February 2011 12:55:28 pm

Hi Sylvain,

What if you compare the tagged 4.4.0? See https://github.com/ezsystems/ezpublish/tree/4.4.0

Regards Robin

Board member, eZ Publish Community Project Board - Member of the share.ez.no team - Key values: Openness and Innovation.

LinkedIn: http://nl.linkedin.com/in/robinmuilwijk // Twitter: http://twitter.com/i_robin // Skype: robin.muilwijk

Damien Pobel

Thursday 03 February 2011 12:48:41 am

Hi,

the name of the branch is quite confusing...

But as said by Robin, some changes have been done on this file since the release of 4.4, see : https://github.com/ezsystems/ezpublish/commits/stable-4.4/kernel/classes/ezcontentobjecttreenode.php (or git log kernel/classes/ezcontentobjecttreenode.php)

Cheers

Damien
Planet eZ Publish.fr : http://www.planet-ezpublish.fr
Certification : http://auth.ez.no/certification/verify/372448
Publications about eZ Publish : http://pwet.fr/tags/keywords/weblog/ez_publish

André R.

Thursday 03 February 2011 2:36:27 am

stable branches are not tags, they change..

Use blame and you'll find this:
https://github.com/ezsystems/ezpublish/commit/6bc6adb37d6fc2828f66f67bb028780521fa59b0

eZ Online Editor 5: http://projects.ez.no/ezoe || eZJSCore (Ajax): http://projects.ez.no/ezjscore || eZ Publish EE http://ez.no/eZPublish/eZ-Publish-Enterprise-Subscription
@: http://twitter.com/andrerom

Damien Pobel

Thursday 03 February 2011 3:13:54 am

"

stable branches are not tags, they change..

"

that's true and quite logical but it can be a bit confusing if you don't know in details the git vocabulary and how eZ Publish releases are done.

Cheers

Damien
Planet eZ Publish.fr : http://www.planet-ezpublish.fr
Certification : http://auth.ez.no/certification/verify/372448
Publications about eZ Publish : http://pwet.fr/tags/keywords/weblog/ez_publish

Bertrand Dunogier

Thursday 03 February 2011 5:11:03 am

It is mainly subversion's fault. Back in the CVS ages, tags & branches were different. GIT has finally restored this, and it makes much more sense this way. A branch is dynamic, and can evolve over time, while a tag isn't supposed to change once created.

I have to admit I did not see the "tags" entry on github right away, though :-)

Bertrand Dunogier
eZ Systems Engineering, Lyon
http://twitter.com/bdunogier
http://gplus.to/BertrandDunogier