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

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

    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.

    I'm talking about having a php_4_0_4 branch on
    cvs.zend.com. There is no precedence for that.

Sure there is. Before we run makedist we tag all three CVS trees.

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.

    I'd prefer a patch without ws change to review it. I'd really
    like to avoid the failures of the past of simply throwing in
    new, untested code.

Uhm it's a bug fix which needs to get into 4.0.4 and his whitespace fixes won't break anything. In any case, if you plan on manually applying it you need to go through it filtering out the whitespace patches in your brain :)

By the way, can we change the diff's back to unified diff's?

    The last cvs message I got contained unidiff. Or what do you
    mean?

Yep, the last one I got too. I guess I looked at a diff while someone was messing around with the messages. Andi --- Andi Gutmans <andi@zend.com> http://www.zend.com/