Re: CVS mess

On Wednesday, June 25, 2003 15:15, Martin Jansen wrote: >> 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. Perhaps not for you, but for others (like me) it is a problem. I work on the installer in the following way: $ cd ~/cvs/php4/pear $ vi ~/bin/pear <- Set the CVS path for installer $ cvs update Make the modifications and tests $ cvs diff Review patches $ cvs commit I can't repeat that steps 3 times for 3 different branches, would collapse my mind :-p. That's why I suggest to free us of this overhead and just commit to one branch and sync the others when needed (by for example pierre who does this quiet good ;) -- Tomas V.V.Cox mailto:cox@idecnet.com