> Can someone explain why James just made it impossible to > properly work with source code which resides in PHP 4 and 5? > > - diffing is impossible > - merging is impossible > - history of new commits becomes fragmented > > James, why did not you discuss this first? All opensource BSDs > have been using _one_ source module since their inception. > In the case of FreeBSD, that dates back to 1993, so this is > clearly a proven model. >
The proposal was floated on the list a few weeks back, from which I referred to this change frequently. The problem is that you cannot sustain such radical changes in source this way. The differences between php3 and php4 are similar to the differences between php4 and php5, with many radical changes to the source code being made in php5. This change allows for proper management of code as we move forward. The tree became fubar the first time someone decided that, in their haste, to start turning php4 HEAD into php5 development. There is one fix for all of this, the most appropriate fix, which is to properly revert a file to revisions previous to the first php5 development, and then bring HEAD into sync with the branch [1]. BSD may be able to make use of one tree, however many open source projects create new modules (eg, apache) and others further have even more screwed up revision control (linux kernel). Just to highlight, once again, the changes that needed to be made to php5 to allow for PECLed extensions etc are only made possible by manually massaging the tree into such a state that permutations that once were not possible are now possible again. -- james -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
