> > The problem is that I now have conflicts in my changes > because CVS was doing its job and merging changes into my > local code. In addition, some of my changes have been > clevery merged with 4.3 specific changes. So, I have to go > and audit my code by hand and check which of the changes I > made, and which are changes made by CVS while trying to merge > stuff from the other branch. > > CVS diff will not help here. >
There is a cumulative patch available here: http://cvs.php.net/~imajes/big.patch.gz which incorporates all the changes from PHP_4_3 to HEAD, which I merged. Simply by reversing the patch and applying it backwards to your code should be sufficient to remove the changes occurred when updating from CVS. -- james -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
