General ⇒ DVCS Info (Mercurial/CVS) :: Archives ⇒ Dragonfly CVS vs CVS php5 branch :: Archived ⇒ Community Forums ⇒ CPG Dragonfly™ CMS
Forum IndexDVCS Info (Mercurial/CVS)

Archived ⇒ Dragonfly CVS vs CVS php5 branch


Hey,
I'm just interested why are the php5 branch and normal cvs worked like on different projects.
I.e the blocks class hasn't been added for the branch (though it wouldn't work like it is atm?) and Your_Account from php5 branch isn't templated in normal CVS.

They will be merged in near future, right?

Server specs (Server OS / Apache / MySQL / PHP / DragonflyCMS):
-


dragonflycms.org/News/...d=254.html

Server specs (Server OS / Apache / MySQL / PHP / DragonflyCMS):
Fedora 25 / Apache 2.4.27 / MariaDB 10.1.26 / PHP 7.1.10 / Mercurial


I know that, but am still interested why they are kind of separately handled? Or the DF php5 branch doesn't work yet, and it can't yet include the features of normal CVS?

Server specs (Server OS / Apache / MySQL / PHP / DragonflyCMS):
-


First: You should know what branching is and how works.

Then you will notice that we are using two different timelines.
So yeah, they are different, and they will stay that way.

I don't care what happens in HEAD untill i need the new stuff in PHP5

Server specs (Server OS / Apache / MySQL / PHP / DragonflyCMS):
Fedora 25 / Apache 2.4.27 / MariaDB 10.1.26 / PHP 7.1.10 / Mercurial


Thanks, got it Smile

Server specs (Server OS / Apache / MySQL / PHP / DragonflyCMS):
-

All times are UTC