Re: cvs: php4(php_4_0_4) / configure.in /main php_version.h

At 19:32 03/12/00 +0100, Sascha Schumann wrote:

On Sun, 3 Dec 2000, Andi Gutmans wrote: At 19:12 03/12/00 +0100, Sascha Schumann wrote:

On Sun, 3 Dec 2000, Andi Gutmans wrote:

I still want to fix the new foo() bug in Zend before 4.0.4! By the way, you guys didn't create a Zend/TSRM branch or did you?

    Nope. Is not Zend stable? =) =)

Stable but buggy :) No seriously, we need to get these tags on both Zend and TSRM too. Maybe we should also add a couple of CVS utility shell scripts to the php4 tree to make it easier for people to fetch a branch, merge and so on.

    Well, there is a tag for RC3, but I'm not sure it is feasible
    to spread a virtual branch over two distinct CVS
    repositories..

We've always spread the release CVS tags. It's the right thing to do.

    Let me know when you have time to fix Zend. I'd like to put
    up a RC4 with the CGI SAPI changes somewhen on Monday.

OK I'll try and get something worked out ASAP. People will need to do: $a =& new foo() in case foo:foo() assigns the $this pointer to something else by reference. But I still need to fix it so that it'll work. Zeev's MySQL fix also needs merging into the RC branch.

    Is it tested? If yes, I'd still prefer to merge the patch
    without the white-space changes.

Why without the white-space changes? You should do an automatic merge so that you make sure you get the whole patch in. Don't worry, Zeev didn't screw up the white-space and it's more risky to do it manually. By the way, can we change the diff's back to unified diff's? Andi --- Andi Gutmans <andi@zend.com> http://www.zend.com/