The great unification has commenced.
There is now a single module php-src which contains all PHP 4
and PHP 5 branches.
BRANCH INFORMATION
Please make yourself familiar with the "cvs checkout -r
BRANCH" notation. It will be necessary from now on for a
checkout.
Some examples:
PHP 5: cvs co -r PHP_5 php-src-ze2
PHP 4: cvs co -r PHP_4 php-src-ze1
PHP 4.3: cvs co -r PHP_4_3 php-src-ze1
The branch names can also be used for cvs diff and merge
operations. Note that all of the above commands create a
local directory named "php-src".
I hope that we can eliminate the ze1/ze2 suffixes soon, but
that is another topic.
UPGRADE PROCEDURE
The php4/php5 modules have been disabled so that you cannot
accidentially commit code into the wrong branch. A "cvs
update" will also fail. Please use the following syntax to
upgrade your existing checkout:
$ cd phpX
$ find . -name Repository|xargs perl -pi -e 's/php./php-src/'
$ cvs upd -r PHP_5
Replace PHP_5 with the name of the branch you are working on.
- Sascha
The great unification has commenced. There is now a single module php-src which contains all PHP 4 and PHP 5 branches.BRANCH INFORMATION
Please make yourself familiar with the "cvs checkout -r BRANCH" notation. It will be necessary from now on for a checkout. Some examples: PHP 5: cvs co -r PHP_5 php-src-ze2
Can't this one to work.
adam@gamma:~/proj/php-src$ ./buildconf
using default Zend directory
buildconf: checking installation...
buildconf: autoconf version 2.13 (ok)
buildconf: automake version 1.5 (ok)
buildconf: libtool version 1.4.3 (ok)
make[1]: *** No rule to make target Zend/Zend.m4', needed byconfigure'. Stop.
make: *** [all] Error 2
adam@gamma:~/proj/php-src$
Zend missing?
-- Adam
PHP 4: cvs co -r PHP_4 php-src-ze1 PHP 4.3: cvs co -r PHP_4_3 php-src-ze1 The branch names can also be used for cvs diff and merge operations. Note that all of the above commands create a local directory named "php-src". I hope that we can eliminate the ze1/ze2 suffixes soon, but that is another topic.UPGRADE PROCEDURE
The php4/php5 modules have been disabled so that you cannot accidentially commit code into the wrong branch. A "cvs update" will also fail. Please use the following syntax to upgrade your existing checkout: $ cd phpX $ find . -name Repository|xargs perl -pi -e 's/php./php-src/' $ cvs upd -r PHP_5 Replace PHP_5 with the name of the branch you are working on. - Sascha--
--
Adam Dickmeiss mailto:adam@indexdata.dk http://www.indexdata.dk
Index Data T: +45 33410100 Mob.: 212 212 66
PHP 5: cvs co -r PHP_5 php-src-ze2
Is it possible to perhaps make PHP_5 synonymous with HEAD while this is
the main dev branch? Perhaps through an alias? The move the alias when
the main dev branch becomes something else? It does seem a bit weird to
not have main development on HEAD.
Also would it be possible to alias php4 and php5 checkouts so they do the
right thing?
-Rasmus
Is it possible to perhaps make PHP_5 synonymous with HEAD while this is
the main dev branch? Perhaps through an alias? The move the alias when
the main dev branch becomes something else? It does seem a bit weird to
not have main development on HEAD.
The lack of consistency regarding branch handling caused a
lot of confusion in the developer base. Especially for those
whose main project is not PHP.
With a rigid mantra "Work on PHP X? Use PHP_X" this becomes
much easier to follow.
Also would it be possible to alias php4 and php5 checkouts so they do the
right thing?
Currently, that would mean selecting a branch and magically
choosing the correct Zend Engine.
I would _love_ to see the latter fixed. This however would
require merging of the two CVS histories which is not that
easy, to say the least.
To be specific, I would like to see
php-src-ze1 -d php-src php-src &Zend &TSRM
php-src-ze2 -d php-src php-src &ze2-dir &TSRM
being folded into one, with ZendEngine2 completely removed.
- Sascha
At 00:37 24/06/2003, Sascha Schumann wrote:
The great unification has commenced. There is now a single module php-src which contains all PHP 4 and PHP 5 branches.BRANCH INFORMATION
Please make yourself familiar with the "cvs checkout -r BRANCH" notation. It will be necessary from now on for a checkout. Some examples: PHP 5: cvs co -r PHP_5 php-src-ze2 PHP 4: cvs co -r PHP_4 php-src-ze1 PHP 4.3: cvs co -r PHP_4_3 php-src-ze1
I think that PHP 5 (or whatever the latest major version of PHP in the
works is at a given moment) should be in HEAD, and not in a branch. CVS
branches are really useful for maintaining old versions, but I think HEAD
is the most suitable branch for ongoing development(*), and we're not
really using it with this setup. Using this approach, we'll develop PHP 5
in HEAD, and once PHP 6 comes around the corner, we'd branch away a PHP_5
branch, and HEAD will become PHP 6. It's pretty similar to the method
we've been using with mini versions.
Thoughts?
Zeev
(*) You can use -A safely, some CVS features (at least in certain versions)
work sub-optimally when inside branches, etc.
A clean checkout using "cvs co -r PHP_4_3 php-src-ze1" does not appear to
fetch the TSRM directory.
Ilia
Sascha Schumann wrote:
The great unification has commenced.
Thanks for your effort!
--
Sebastian Bergmann
http://sebastian-bergmann.de/ http://phpOpenTracker.de/
http://www.professionelle-softwareentwicklung-mit-php5.de/