Re: Re: PHP 4.0 Bug #7975 Updated: mod_perl and PHP

> Oh? I must have missed that one..was some bug report related to it? Yes, there were a couple of them. Some weeks ago there was also a Slashdot posting where some people complained about this bad interaction between mod_perl and PHP. > btw. How should the fixes be committed?? I'm not that good with this > branching..I have separate checkouts of HEAD and php_4_0_4 branches. > > How should the NEWS entries handled? Manually? I committed the > fix first into the HEAD branch. Should I have committed it first > into the php_4_0_4 branch and then commit it into HEAD?? > > Any good instructions how to do this right?? Everything should go into HEAD first. At the current stage, only bug fixes should be committed to the release branch. When a bug fix has been verified to compile and to work, then you might consider merging it into the release branch. Here is an example. (assuming this is a normal checkout from the main branch) $ cd php4/ext/foo # Change to the release branch $ cvs upd -r php_4_0_4 [optional file list] # Merge in the changes from the HEAD revision $ cvs upd -kk -j HEAD [optional file list] Don't forget to resolve conflicts at this stage. # You might want to add the revision numbers you have merged from $ cvs com -m "Merged from rev 1.xx" [list] # Back to the main branch $ cvs upd -A [list] - Sascha