Re: CVS mess

On Wed Jun 25, 2003 at 02:3426PM +0200, Tomas V.V.Cox wrote: > BTW, now the HEAD branch is for PHP 5 development. AFAIK noone here > has tested the pear cmd under PHP5, so which branch are we going to > choose for commits? Even before the structure in CVS has been re-arranged, HEAD was the "branch" for PHP 5 developement. > One idea could be to use only PHP_4, merging changes to the branches of new releases > (like now PHP_4_3). When finally make the pear cmd work under PHP5 > (and heavily tested) we could then switch to HEAD for the delopment and abandon > PHP_4. Keeping in mind that there will be a beta of PHP 5 pretty soon, I think it's better to commit all changes to HEAD and PHP_4 and to merge bug fixes into PHP_4_3. This way we don't run into merging trouble when it becomes time for us to steer the development of the installer for PHP 5. > I guess that working in 3 different branches at the same time for us > will introduce wrong commits and missmatched patches. As there are only few people working on the installer (Stig, Pierre, you and me), I don't see much of a problem there. -- - Martin Martin Jansen http://martinjansen.com/