Err, no. *Hacking the repository is not using revision control properly*.
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. This is fubar, and it will probably be easier to make a clean start and rewrite all that code from scratch. --Wez. On Mon, 23 Jun 2003, James Cox wrote: > So apologies for the slight inconvenience... But lets be honest, if it > will take you longer than 1/2 hour to get your trees in order again, > then you aren't using revision control properly. -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
