> > At 10:32 AM 6/23/2003 -0700, Rasmus Lerdorf wrote: > >A bunch of things are broken. Files are missing in php4 > head and the > >wrong versions of files are also in there. I think we need to roll > >this change back as soon as possible and take another shot > at this in a > >much more organized manner. > > Maybe it's really best to restore a backup and not fix it > manually and then decide how to approach this.
At any rate, the current php4 tree should be synced with a backup from before the change. Let me clear up what the problems are, and lets discuss a method of fixing them. Right now, PHP5 should continue in the php5 module. Sascha is slightly wrong in his assesment that PHP5 development can continue as it was (HEAD of php4). A bunch of out dated folders needed to be moved permanently out the way, and the only way to do that safely is to remove it properly from cvs. (I hasten to add that svn does this properly already). The problem we have instead is that php4 can now only continue in the PHP_4_3 branch. This is because HEAD is perverted with PHP5 only code, and code removals (thanks guys. You know who you are.) which have caused incompatibilities. The solution which I see as being the most appropriate: cvs admin -o<revision that is good +1> <file> For each file in the repository. This includes deleted files where the deletion and any edits need to be removed. Then the code from the branch needs to be added to HEAD. At that point, php4 HEAD should compile as what it is labeled as being. -- james -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
